Skip to content

Commit

Permalink
Formatting review and examples review
Browse files Browse the repository at this point in the history
  • Loading branch information
raysan5 committed Jan 12, 2025
1 parent 4bceddd commit 2f6230e
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 125 deletions.
5 changes: 3 additions & 2 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,12 @@ ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),PLATFORM_WEB PLATFORM_WEB_R
# --preload-file resources # specify a resources folder for data compilation
# --source-map-base # allow debugging in browser with source map
# --shell-file shell.html # define a custom shell .html and output extension
LDFLAGS += -sTOTAL_MEMORY=$(BUILD_WEB_HEAP_SIZE) -sFORCE_FILESYSTEM=1 -sMINIFY_HTML=0

# Using GLFW3 library (instead of RGFW)
ifeq ($(TARGET_PLATFORM),PLATFORM_WEB)
LDFLAGS += -sUSE_GLFW=3
endif

LDFLAGS += -sTOTAL_MEMORY=$(BUILD_WEB_HEAP_SIZE) -sFORCE_FILESYSTEM=1

# Build using asyncify
ifeq ($(BUILD_WEB_ASYNCIFY),TRUE)
Expand Down
5 changes: 3 additions & 2 deletions examples/Makefile.Web
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,13 @@ ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_WEB PLATFORM_WEB_RGFW))
# --preload-file resources # specify a resources folder for data compilation
# --source-map-base # allow debugging in browser with source map
# --shell-file shell.html # define a custom shell .html and output extension
LDFLAGS += -sTOTAL_MEMORY=$(BUILD_WEB_HEAP_SIZE) -sFORCE_FILESYSTEM=1 -sEXPORTED_RUNTIME_METHODS=ccall -sMINIFY_HTML=0

# Using GLFW3 library (instead of RGFW)
ifeq ($(PLATFORM),PLATFORM_WEB)
LDFLAGS += -sUSE_GLFW=3
endif

LDFLAGS += -sEXPORTED_RUNTIME_METHODS=ccall -s

# Build using asyncify
ifeq ($(BUILD_WEB_ASYNCIFY),TRUE)
LDFLAGS += -sASYNCIFY
Expand Down
Binary file modified examples/core/core_2d_camera_mouse_zoom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/core/core_basic_screen_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ int main(void)
{
// Update
//----------------------------------------------------------------------------------
switch(currentScreen)
switch (currentScreen)
{
case LOGO:
{
Expand Down
83 changes: 0 additions & 83 deletions examples/core/core_input_gamepad_info.c

This file was deleted.

2 changes: 1 addition & 1 deletion examples/core/core_input_multitouch.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ int main(void)
// Get the touch point count ( how many fingers are touching the screen )
int tCount = GetTouchPointCount();
// Clamp touch points available ( set the maximum touch points allowed )
if(tCount > MAX_TOUCH_POINTS) tCount = MAX_TOUCH_POINTS;
if (tCount > MAX_TOUCH_POINTS) tCount = MAX_TOUCH_POINTS;
// Get touch points positions
for (int i = 0; i < tCount; ++i) touchPositions[i] = GetTouchPosition(i);
//----------------------------------------------------------------------------------
Expand Down
24 changes: 4 additions & 20 deletions examples/core/core_input_virtual_controls.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,26 +115,10 @@ int main(void)
// Move player according to pressed button
switch (pressedButton)
{
case BUTTON_UP:
{
playerPosition.y -= playerSpeed*GetFrameTime();
break;
}
case BUTTON_LEFT:
{
playerPosition.x -= playerSpeed*GetFrameTime();
break;
}
case BUTTON_RIGHT:
{
playerPosition.x += playerSpeed*GetFrameTime();
break;
}
case BUTTON_DOWN:
{
playerPosition.y += playerSpeed*GetFrameTime();
break;
}
case BUTTON_UP: playerPosition.y -= playerSpeed*GetFrameTime(); break;
case BUTTON_LEFT: playerPosition.x -= playerSpeed*GetFrameTime(); break;
case BUTTON_RIGHT: playerPosition.x += playerSpeed*GetFrameTime(); break;
case BUTTON_DOWN: playerPosition.y += playerSpeed*GetFrameTime(); break;
default: break;
};

Expand Down
1 change: 0 additions & 1 deletion examples/core/core_random_sequence.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ static void DrawTextCenterKeyHelp(const char *key, const char *text, int posX, i
int pressSize = MeasureText("Press", fontSize);
int keySize = MeasureText(key, fontSize);
int textSize = MeasureText(text, fontSize);
int totalSize = pressSize + 2*spaceSize + keySize + 2*spaceSize + textSize;
int textSizeCurrent = 0;

DrawText("Press", posX, posY, fontSize, color);
Expand Down
Binary file added examples/models/models_gpu_skinning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/models/models_mesh_generation.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ int main(void)
DrawRectangleLines(30, 400, 310, 30, Fade(DARKBLUE, 0.5f));
DrawText("MOUSE LEFT BUTTON to CYCLE PROCEDURAL MODELS", 40, 410, 10, BLUE);

switch(currentModel)
switch (currentModel)
{
case 0: DrawText("PLANE", 680, 10, 20, DARKBLUE); break;
case 1: DrawText("CUBE", 680, 10, 20, DARKBLUE); break;
Expand Down
12 changes: 6 additions & 6 deletions examples/models/models_point_rendering.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#define MIN_POINTS 1000 // 1 thousand

// Generate mesh using points
Mesh GenMeshPoints(int numPoints);
static Mesh GenMeshPoints(int numPoints);

//------------------------------------------------------------------------------------
// Program main entry point
Expand Down Expand Up @@ -56,7 +56,7 @@ int main()
//--------------------------------------------------------------------------------------

// Main game loop
while(!WindowShouldClose())
while (!WindowShouldClose())
{
// Update
//----------------------------------------------------------------------------------
Expand Down Expand Up @@ -147,7 +147,7 @@ int main()
}

// Generate a spherical point cloud
Mesh GenMeshPoints(int numPoints)
static Mesh GenMeshPoints(int numPoints)
{
Mesh mesh = {
.triangleCount = 1,
Expand All @@ -159,9 +159,9 @@ Mesh GenMeshPoints(int numPoints)
// https://en.wikipedia.org/wiki/Spherical_coordinate_system
for (int i = 0; i < numPoints; i++)
{
float theta = PI*rand()/RAND_MAX;
float phi = 2.0f*PI*rand()/RAND_MAX;
float r = 10.0f*rand()/RAND_MAX;
float theta = ((float)PI*rand())/RAND_MAX;
float phi = (2.0f*PI*rand())/RAND_MAX;
float r = (10.0f*rand())/RAND_MAX;

mesh.vertices[i*3 + 0] = r*sin(theta)*cos(phi);
mesh.vertices[i*3 + 1] = r*sin(theta)*sin(phi);
Expand Down
4 changes: 2 additions & 2 deletions examples/models/models_tesseract_view.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int main(void)

// Projection from XYZW to XYZ from perspective point (0, 0, 0, 3)
// NOTE: Trace a ray from (0, 0, 0, 3) > p and continue until W = 0
float c = 3/(3 - p.w);
float c = 3.0f/(3.0f - p.w);
p.x = c * p.x;
p.y = c * p.y;
p.z = c * p.z;
Expand All @@ -95,7 +95,7 @@ int main(void)
for (int i = 0; i < 16; i++)
{
// Draw spheres to indicate the W value
DrawSphere(transformed[i], fabsf(wValues[i]*0.1), RED);
DrawSphere(transformed[i], fabsf(wValues[i]*0.1f), RED);

for (int j = 0; j < 16; j++)
{
Expand Down
2 changes: 1 addition & 1 deletion examples/others/raymath_vector_angle.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int main(void)

if (IsKeyPressed(KEY_SPACE)) angleMode = !angleMode;

if(angleMode == 0 && IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) v1 = GetMousePosition();
if ((angleMode == 0) && IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) v1 = GetMousePosition();

if (angleMode == 0)
{
Expand Down
2 changes: 1 addition & 1 deletion examples/shaders/shaders_deferred_render.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ int main(void)
// that represent light positions in default forward rendering
BeginMode3D(camera);
rlEnableShader(rlGetShaderIdDefault());
for(int i = 0; i < MAX_LIGHTS; i++)
for (int i = 0; i < MAX_LIGHTS; i++)
{
if (lights[i].enabled) DrawSphereEx(lights[i].position, 0.2f, 8, 8, lights[i].color);
else DrawSphereWires(lights[i].position, 0.2f, 8, 8, ColorAlpha(lights[i].color, 0.3f));
Expand Down
9 changes: 6 additions & 3 deletions examples/textures/textures_image_channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ int main(void)
{
// Initialization
//--------------------------------------------------------------------------------------

const int screenWidth = 800;
const int screenHeight = 450;

Expand Down Expand Up @@ -60,8 +59,6 @@ int main(void)
UnloadImage(imageBlue);
UnloadImage(backgroundImage);

SetTargetFPS(60); // Set our game to run at 60 frames-per-second

Rectangle fudesumiRec = {0, 0, fudesumiImage.width, fudesumiImage.height};

Rectangle fudesumiPos = {50, 10, fudesumiImage.width*0.8f, fudesumiImage.height*0.8f};
Expand All @@ -70,11 +67,17 @@ int main(void)
Rectangle bluePos = { 410, 230, fudesumiPos.width / 2, fudesumiPos.height / 2 };
Rectangle alphaPos = { 600, 230, fudesumiPos.width / 2, fudesumiPos.height / 2 };

SetTargetFPS(60); // Set our game to run at 60 frames-per-second
//--------------------------------------------------------------------------------------

// Main game loop
while (!WindowShouldClose()) // Detect window close button or ESC key
{
// Draw
//----------------------------------------------------------------------------------
// TODO...
//----------------------------------------------------------------------------------

// Draw
//----------------------------------------------------------------------------------
BeginDrawing();
Expand Down
2 changes: 1 addition & 1 deletion examples/textures/textures_image_generation.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ int main(void)
DrawRectangleLines(30, 400, 325, 30, Fade(WHITE, 0.5f));
DrawText("MOUSE LEFT BUTTON to CYCLE PROCEDURAL TEXTURES", 40, 410, 10, WHITE);

switch(currentTexture)
switch (currentTexture)
{
case 0: DrawText("VERTICAL GRADIENT", 560, 10, 20, RAYWHITE); break;
case 1: DrawText("HORIZONTAL GRADIENT", 540, 10, 20, RAYWHITE); break;
Expand Down

0 comments on commit 2f6230e

Please sign in to comment.