lily/game-dev
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lily:85164ad2f09fe4332da1ce37a0ab52bcb48e38d5
Branches Tags
lily:main
...
compare: lily:e2106d8445e1d1ae126c955772e879f5501dec75
Branches Tags
lily:main

2 commits
85164ad2f0 ... e2106d8445

Author SHA1 Message Date
Lily Rose
e2106d8445 Tidy switch case styling 2025-03-05 18:53:19 +11:00
Lily Rose
5ff4a06340 Fix text positioning 2025-03-05 18:52:56 +11:00
2 changed files with 20 additions and 42 deletions
Show stats Expand all files Collapse all files

51
main.c
View file

@ -133,24 +133,19 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
switch (event->type) {
case SDL_EVENT_QUIT: {
ret_val = SDL_APP_SUCCESS;
break;
}
} break;
case SDL_EVENT_WINDOW_RESIZED: {
Clay_SetLayoutDimensions((Clay_Dimensions) { (float) event->window.data1, (float) event->window.data2 });
break;
}
} break;
case SDL_EVENT_MOUSE_MOTION: {
Clay_SetPointerState((Clay_Vector2) { event->motion.x, event->motion.y }, event->motion.state & SDL_BUTTON_LMASK);
break;
}
} break;
case SDL_EVENT_MOUSE_BUTTON_DOWN: {
Clay_SetPointerState((Clay_Vector2) { event->button.x, event->button.y }, event->button.button == SDL_BUTTON_LEFT);
break;
}
} break;
case SDL_EVENT_MOUSE_WHEEL: {
Clay_UpdateScrollContainers(true, (Clay_Vector2) { event->wheel.x, event->wheel.y }, 0.01f);
break;
}
} break;
case SDL_EVENT_KEY_DOWN: {
SDL_KeyboardEvent kb_event = event->key;
SDL_Keycode keycode = kb_event.key;
@ -165,22 +160,18 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
ecs_world_t *world = state->world;
ecs_entity_t e = ecs_entity(world, { .name = "Lily" });
SDL_Log("Spawned entity [%s]", ecs_get_name(world, e));
break;
}
} break;
case SDL_SCANCODE_X: {
ecs_world_t *world = state->world;
ecs_entity_t e = ecs_new(world);
SDL_Log("Spawned unnamed entity");
break;
}
} break;
case SDL_SCANCODE_F3: {
Clay_SetDebugModeEnabled(!Clay_IsDebugModeEnabled()); // toggle debug mode
SDL_Log("Toggled debug mode");
break;
}
} break;
}
break;
}
} break;
case SDL_EVENT_KEY_UP: {
SDL_KeyboardEvent kb_event = event->key;
SDL_Keycode keycode = kb_event.key;
@ -193,11 +184,9 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
SDL_Log("Entity [%s] is %s", ecs_get_name(world, e), ecs_is_alive(world, e) ? "alive" : "dead");
ecs_delete(world, e);
SDL_Log("Entity is %s", ecs_is_alive(world, e) ? "alive" : "dead");
break;
}
} break;
}
break;
}
} break;
case SDL_EVENT_GAMEPAD_ADDED: {
SDL_GamepadDeviceEvent device_event = event->gdevice;
SDL_JoystickID joystick_id = device_event.which;
@ -213,8 +202,7 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
if (!state->gamepad) {
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Failed to open gamepad: %s", SDL_GetError());
}
break;
}
} break;
case SDL_EVENT_GAMEPAD_REMOVED: {
SDL_GamepadDeviceEvent device_event = event->gdevice;
SDL_JoystickID joystick_id = device_event.which;
@ -224,8 +212,7 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
SDL_CloseGamepad(state->gamepad);
state->gamepad = NULL;
}
break;
}
} break;
case SDL_EVENT_GAMEPAD_BUTTON_DOWN: {
SDL_GamepadButtonEvent button_event = event->gbutton;
SDL_GamepadButton button = button_event.button;
@ -235,24 +222,18 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Failed to rumble gamepad: %s", SDL_GetError());
}
}
break;
}
} break;
case SDL_EVENT_GAMEPAD_BUTTON_UP: {
SDL_GamepadButtonEvent button_event = event->gbutton;
SDL_GamepadButton button = button_event.button;
SDL_Log("Gamepad button up: %s", SDL_GetGamepadStringForButton(button));
break;
}
} break;
case SDL_EVENT_GAMEPAD_AXIS_MOTION: {
SDL_GamepadAxisEvent axis_event = event->gaxis;
SDL_GamepadAxis axis = axis_event.axis;
Sint16 val = axis_event.value;
SDL_Log("Gamepad axis motion: %s - %d", SDL_GetGamepadStringForAxis(axis), val);
break;
}
default: {
break;
}
} break;
}
return ret_val;

11
vendor/clay/clay_renderer_SDL3.c vendored
View file

@ -17,7 +17,7 @@ void SDL_Clay_RenderClayCommands(Clay_SDL3RendererData *rendererData, Clay_Rende
TTF_Font *font = rendererData->fonts[config->fontId];
TTF_Text *text = TTF_CreateText(rendererData->textEngine, font, config->stringContents.chars, config->stringContents.length);
TTF_SetTextColor(text, config->textColor.r, config->textColor.g, config->textColor.b, config->textColor.a);
TTF_DrawRendererText(text, bounding_box.x, bounding_box.y);
TTF_DrawRendererText(text, (int)bounding_box.x, (int)bounding_box.y);
TTF_DestroyText(text);
} break;
case CLAY_RENDER_COMMAND_TYPE_BORDER: {
@ -34,12 +34,10 @@ void SDL_Clay_RenderClayCommands(Clay_SDL3RendererData *rendererData, Clay_Rende
.h = bounding_box.height,
};
SDL_SetRenderClipRect(rendererData->renderer, &currentClippingRectangle);
break;
}
} break;
case CLAY_RENDER_COMMAND_TYPE_SCISSOR_END: {
SDL_SetRenderClipRect(rendererData->renderer, NULL);
break;
}
} break;
case CLAY_RENDER_COMMAND_TYPE_IMAGE: {
SDL_Surface *image = (SDL_Surface *)rcmd->renderData.image.imageData;
SDL_Texture *texture = SDL_CreateTextureFromSurface(rendererData->renderer, image);
@ -51,8 +49,7 @@ void SDL_Clay_RenderClayCommands(Clay_SDL3RendererData *rendererData, Clay_Rende
};
SDL_RenderTexture(rendererData->renderer, texture, NULL, &dest);
SDL_DestroyTexture(texture);
break;
}
} break;
default:
SDL_Log("Unknown render command type: %d", rcmd->commandType);
}