Merge branch 'master' of ssh.marcbarbier.fr:Marc/gamejam-polytech

This commit is contained in:
Marc
2023-01-22 17:01:00 +01:00
+20 -2
View File
@@ -38,6 +38,8 @@ RenderObject_t scoreText;
static RenderId_t scoreTextId = -1; static RenderId_t scoreTextId = -1;
static int victimHeight; static int victimHeight;
static RenderId_t pressSpaceShadowId;
static RenderId_t pressSpaceTextId;
#define VICTIME_COUNT 4 #define VICTIME_COUNT 4
#define VICTIME_SIZE 0.5f #define VICTIME_SIZE 0.5f
@@ -254,6 +256,18 @@ int game_staticRender(void){
text_renderText(&scoreText, 50, 1.f, black, "./assets/fonts/Quinquefive.ttf", 20, "Press F to buy steroids for 200J"); text_renderText(&scoreText, 50, 1.f, black, "./assets/fonts/Quinquefive.ttf", 20, "Press F to buy steroids for 200J");
steroidText = scene_addRenderObject(&gameScene, scoreText, STEROIDS_POSITION, 0); steroidText = scene_addRenderObject(&gameScene, scoreText, STEROIDS_POSITION, 0);
RenderObject_t pressSpaceShadow = EMPTY_RENDER_OBJECT;
strcpy(pressSpaceShadow.name, "pressSpaceShadow");
text_renderText(&pressSpaceShadow, 50, 1, black, "./assets/fonts/Quinquefive.ttf", 20, "Press space to teach respect");
pressSpaceShadowId = scene_addRenderObject(&gameScene, pressSpaceShadow, 0.30f * CAMERA_WIDTH, 0.8f * CAMERA_HEIGHT);
RenderObject_t pressSpaceText = EMPTY_RENDER_OBJECT;
strcpy(pressSpaceText.name, "pressSpaceText");
SDL_Color white = {255, 255, 255, 255};
text_renderText(&pressSpaceText, 50, 1, white, "./assets/fonts/Quinquefive.ttf", 20, "Press space to teach respect");
pressSpaceTextId = scene_addRenderObject(&gameScene, pressSpaceText, 0.295f * CAMERA_WIDTH, 0.82f * CAMERA_HEIGHT);
return 0; return 0;
} }
@@ -359,12 +373,16 @@ void game_handleSpaceKeyInput(void){
scene_moveRenderObject(&gameScene, personId, 0, CAMERA_HEIGHT * 2); scene_moveRenderObject(&gameScene, personId, 0, CAMERA_HEIGHT * 2);
personId = victims[rand() % 4]; personId = victims[rand() % 4];
kicked=false; kicked=false;
} } else{
else{
isSpaceKeypressed = true; isSpaceKeypressed = true;
strength = - 32 * powf(fabs(strengthBarSliderDistance - 0.5f/2), 2) + 2; strength = - 32 * powf(fabs(strengthBarSliderDistance - 0.5f/2), 2) + 2;
personVelocityX *= strength * adameStrength; personVelocityX *= strength * adameStrength;
scene_moveRenderObject(&gameScene, strengthBarId, 0, CAMERA_HEIGHT * 2); scene_moveRenderObject(&gameScene, strengthBarId, 0, CAMERA_HEIGHT * 2);
scene_moveRenderObject(&gameScene, strengthBarSliderId, 0, CAMERA_HEIGHT * 2); scene_moveRenderObject(&gameScene, strengthBarSliderId, 0, CAMERA_HEIGHT * 2);
scene_removeRenderObject(&gameScene, pressSpaceShadowId);
scene_removeRenderObject(&gameScene, pressSpaceTextId);
} }
} }
// press space to teach respect