diff options
| -rw-r--r-- | API.md | 46 | ||||
| -rw-r--r-- | examples/heightmap/main.lua | 2 | ||||
| -rw-r--r-- | examples/iqm_test/main.lua | 2 | ||||
| -rw-r--r-- | examples/lightmap/main.lua | 2 | ||||
| -rw-r--r-- | examples/point_triangle_collision/main.lua | 2 | ||||
| -rw-r--r-- | examples/ray/main.lua | 2 | ||||
| -rw-r--r-- | src/lua_core.c | 24 |
7 files changed, 67 insertions, 13 deletions
@@ -671,22 +671,58 @@ TEXTURE_SOURCE_RENDER_TEXTURE ## Globals - Colors -WHITE +LIGHTGRAY -BLACK +GRAY -BLANK +DARKGRAY -MAGENTA +YELLOW -RAYWHITE +GOLD + +ORANGE + +PINK RED +MAROON + GREEN +LIME + +DARKGREEN + +SKYBLUE + BLUE +DARKBLUE + +PURPLE + +VIOLET + +DARKPURPLE + +BEIGE + +BROWN + +DARKBROWN + +WHITE + +BLACK + +BLANK + +MAGENTA + +RAYWHITE + ## Globals - Math PI diff --git a/examples/heightmap/main.lua b/examples/heightmap/main.lua index 899ab72..7d26e02 100644 --- a/examples/heightmap/main.lua +++ b/examples/heightmap/main.lua @@ -29,7 +29,7 @@ function init() camera = RL_CreateCamera3D() RL_SetCamera3DPosition( camera, { 0, 8, 16 } ) RL_SetCamera3DTarget( camera, { 0, 0, 0 } ) - RL_SetCamera3DUp( camera, { 0, 2, 0 } ) + RL_SetCamera3DUp( camera, { 0, 1, 0 } ) RL_SetCamera3DMode( camera, CAMERA_FREE ) heigthImage = RL_LoadImage( RL_GetBasePath().."../resources/images/heightmap.png" ) diff --git a/examples/iqm_test/main.lua b/examples/iqm_test/main.lua index 2aa72bc..40a2d60 100644 --- a/examples/iqm_test/main.lua +++ b/examples/iqm_test/main.lua @@ -22,7 +22,7 @@ function init() camera = RL_CreateCamera3D() RL_SetCamera3DPosition( camera, { 0, 2, 4 } ) RL_SetCamera3DTarget( camera, { 0, 0, 0 } ) - RL_SetCamera3DUp( camera, { 0, 2, 0 } ) + RL_SetCamera3DUp( camera, { 0, 1, 0 } ) RL_SetCamera3DMode( camera, CAMERA_FREE ) material = RL_CreateMaterial( { diff --git a/examples/lightmap/main.lua b/examples/lightmap/main.lua index eb81d96..8a0406f 100644 --- a/examples/lightmap/main.lua +++ b/examples/lightmap/main.lua @@ -21,7 +21,7 @@ function init() camera = RL_CreateCamera3D() RL_SetCamera3DPosition( camera, { 0, 8, 16 } ) RL_SetCamera3DTarget( camera, { 0, 0, 0 } ) - RL_SetCamera3DUp( camera, { 0, 2, 0 } ) + RL_SetCamera3DUp( camera, { 0, 1, 0 } ) RL_SetCamera3DMode( camera, CAMERA_FREE ) local ts = PLANE_SIZE diff --git a/examples/point_triangle_collision/main.lua b/examples/point_triangle_collision/main.lua index b2cbc29..cade3d0 100644 --- a/examples/point_triangle_collision/main.lua +++ b/examples/point_triangle_collision/main.lua @@ -40,7 +40,7 @@ function init() camera = RL_CreateCamera3D() RL_SetCamera3DPosition( camera, { 0, 1, 2 } ) RL_SetCamera3DTarget( camera, { 0, 0, 0 } ) - RL_SetCamera3DUp( camera, { 0, 2, 0 } ) + RL_SetCamera3DUp( camera, { 0, 1, 0 } ) RL_SetCamera3DMode( camera, CAMERA_FREE ) calcNormal( tri ) diff --git a/examples/ray/main.lua b/examples/ray/main.lua index 43374e2..07a869e 100644 --- a/examples/ray/main.lua +++ b/examples/ray/main.lua @@ -29,7 +29,7 @@ function init() camera = RL_CreateCamera3D() RL_SetCamera3DPosition( camera, { 0, 2, 4 } ) RL_SetCamera3DTarget( camera, { 0, 0, 0 } ) - RL_SetCamera3DUp( camera, { 0, 2, 0 } ) + RL_SetCamera3DUp( camera, { 0, 1, 0 } ) RL_SetCamera3DMode( camera, CAMERA_FREE ) sphereMesh = RL_GenMeshSphere( 1.0, 8, 10 ) diff --git a/src/lua_core.c b/src/lua_core.c index 17afffb..3739496 100644 --- a/src/lua_core.c +++ b/src/lua_core.c @@ -351,14 +351,32 @@ void defineGlobals() { assignGlobalInt( TEXTURE_SOURCE_TEXTURE, "TEXTURE_SOURCE_TEXTURE" ); assignGlobalInt( TEXTURE_SOURCE_RENDER_TEXTURE, "TEXTURE_SOURCE_RENDER_TEXTURE" ); /* Colors */ + assignGlobalColor( LIGHTGRAY, "LIGHTGRAY" ); + assignGlobalColor( GRAY, "GRAY" ); + assignGlobalColor( DARKGRAY, "DARKGRAY" ); + assignGlobalColor( YELLOW, "YELLOW" ); + assignGlobalColor( GOLD, "GOLD" ); + assignGlobalColor( ORANGE, "ORANGE" ); + assignGlobalColor( PINK, "PINK" ); + assignGlobalColor( RED, "RED" ); + assignGlobalColor( MAROON, "MAROON" ); + assignGlobalColor( GREEN, "GREEN" ); + assignGlobalColor( LIME, "LIME" ); + assignGlobalColor( DARKGREEN, "DARKGREEN" ); + assignGlobalColor( SKYBLUE, "SKYBLUE" ); + assignGlobalColor( BLUE, "BLUE" ); + assignGlobalColor( DARKBLUE, "DARKBLUE" ); + assignGlobalColor( PURPLE, "PURPLE" ); + assignGlobalColor( VIOLET, "VIOLET" ); + assignGlobalColor( DARKPURPLE, "DARKPURPLE" ); + assignGlobalColor( BEIGE, "BEIGE" ); + assignGlobalColor( BROWN, "BROWN" ); + assignGlobalColor( DARKBROWN, "DARKBROWN" ); assignGlobalColor( WHITE, "WHITE" ); assignGlobalColor( BLACK, "BLACK" ); assignGlobalColor( BLANK, "BLANK" ); assignGlobalColor( MAGENTA, "MAGENTA" ); assignGlobalColor( RAYWHITE, "RAYWHITE" ); - assignGlobalColor( RED, "RED" ); - assignGlobalColor( GREEN, "GREEN" ); - assignGlobalColor( BLUE, "BLUE" ); /* Math */ assignGlobalFloat( PI, "PI" ); assignGlobalFloat( DEG2RAD, "DEG2RAD" ); |