summaryrefslogtreecommitdiffhomepage
path: root/examples/shaders
diff options
context:
space:
mode:
authorRay <[email protected]>2020-03-03 01:21:06 +0100
committerRay <[email protected]>2020-03-03 01:21:06 +0100
commita6297a2be12412ebec498b9a919b7a92f876ec46 (patch)
treebd76033a4f23e22e16ecf9a7f1bb1bf78a0a4e19 /examples/shaders
parent8724cf2ea523b6cf26a5b2217c54c65673db5cb2 (diff)
downloadraylib-a6297a2be12412ebec498b9a919b7a92f876ec46.tar.gz
raylib-a6297a2be12412ebec498b9a919b7a92f876ec46.zip
Some code tweaks
Diffstat (limited to 'examples/shaders')
-rw-r--r--examples/shaders/rlights.h10
-rw-r--r--examples/shaders/shaders_basic_lighting.c8
2 files changed, 7 insertions, 11 deletions
diff --git a/examples/shaders/rlights.h b/examples/shaders/rlights.h
index b564efc3..0441062b 100644
--- a/examples/shaders/rlights.h
+++ b/examples/shaders/rlights.h
@@ -69,16 +69,10 @@ extern "C" { // Prevents name mangling of functions
#endif
//----------------------------------------------------------------------------------
-// Global Variables Definition
-//----------------------------------------------------------------------------------
-int lightsCount = 0; // Current amount of created lights
-
-//----------------------------------------------------------------------------------
// Module Functions Declaration
//----------------------------------------------------------------------------------
Light CreateLight(int type, Vector3 position, Vector3 target, Color color, Shader shader); // Create a light and get shader locations
void UpdateLightValues(Shader shader, Light light); // Send light properties to shader
-//void InitLightLocations(Shader shader, Light *light); // Init light shader locations
#ifdef __cplusplus
}
@@ -110,7 +104,7 @@ void UpdateLightValues(Shader shader, Light light); // Send light proper
//----------------------------------------------------------------------------------
// Global Variables Definition
//----------------------------------------------------------------------------------
-// ...
+static int lightsCount = 0; // Current amount of created lights
//----------------------------------------------------------------------------------
// Module specific Functions Declaration
@@ -142,6 +136,8 @@ Light CreateLight(int type, Vector3 position, Vector3 target, Color color, Shade
char posName[32] = "lights[x].position\0";
char targetName[32] = "lights[x].target\0";
char colorName[32] = "lights[x].color\0";
+
+ // Set location name [x] depending on lights count
enabledName[7] = '0' + lightsCount;
typeName[7] = '0' + lightsCount;
posName[7] = '0' + lightsCount;
diff --git a/examples/shaders/shaders_basic_lighting.c b/examples/shaders/shaders_basic_lighting.c
index a5bb145a..21883efa 100644
--- a/examples/shaders/shaders_basic_lighting.c
+++ b/examples/shaders/shaders_basic_lighting.c
@@ -112,7 +112,7 @@ int main(void)
UpdateCamera(&camera); // Update camera
// Make the lights do differing orbits
- angle -= 0.02;
+ angle -= 0.02f;
lights[0].position.x = cosf(angle)*4.0f;
lights[0].position.z = sinf(angle)*4.0f;
lights[1].position.x = cosf(-angle*0.6f)*4.0f;
@@ -128,8 +128,8 @@ int main(void)
UpdateLightValues(shader, lights[3]);
// Rotate the torus
- modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateX(-0.025));
- modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateZ(0.012));
+ modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateX(-0.025f));
+ modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateZ(0.012f));
// Update the light shader with the camera view position
float cameraPos[3] = { camera.position.x, camera.position.y, camera.position.z };
@@ -161,7 +161,7 @@ int main(void)
DrawFPS(10, 10);
- DrawText("Keys RGB & W toggle lights", 10, 30, 20, DARKGRAY);
+ DrawText("Use keys RGBW to toggle lights", 10, 30, 20, DARKGRAY);
EndDrawing();
//----------------------------------------------------------------------------------