shampoo/pepy
shampoo
/
pepy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added velocity to delta helper function

This commit is contained in:
frank 2022-06-16 16:46:17 -04:00
parent 4bf9b6cf9d
commit 6e958debf0
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sb

@ -1 +1 @@
Subproject commit ee119ecc7e4287838cec5aac127820d4738de17f Subproject commit 3444afc2c1291814d97efb94ca8aecb6e6698c40

9
src/Pepy.cpp
View File

@ -115,18 +115,19 @@ void Pepy::respond(SDL_Event& event)
{ {
/* Will check if reset should be triggered */ /* Will check if reset should be triggered */
bool reset = false; bool reset = false;
/* Check for any direction when waiting to reset */ /* Check for any direction key when waiting to reset */
if (stopped && delegate.compare(event, {"up", "down", "left", "right"})) if (stopped && delegate.compare(event, {"up", "down", "left", "right"}))
{ {
reset = true; reset = true;
} }
/* Check mouse buttons for grabbing */
if (event.type == SDL_MOUSEBUTTONDOWN) if (event.type == SDL_MOUSEBUTTONDOWN)
{ {
if (shaking) if (shaking)
{ {
grabbed = true; grabbed = true;
} }
/* Mouse button will trigger reset when stopped */ /* Mouse button will trigger reset when game is waiting to reset */
else if (stopped) else if (stopped)
{ {
reset = true; reset = true;
@ -136,7 +137,7 @@ void Pepy::respond(SDL_Event& event)
{ {
grabbed = false; grabbed = false;
} }
/* Reset to countdown */ /* Reset to cuckoo time */
if (reset) if (reset)
{ {
float size = configuration()["sim"]["ball-scale"]; float size = configuration()["sim"]["ball-scale"];
@ -251,7 +252,7 @@ void Pepy::update()
ball.second.x = angle + glm::half_pi<float>(); ball.second.x = angle + glm::half_pi<float>();
} }
} }
glm::vec2 step {glm::sin(ball.second.x) * ball.second.y, -glm::cos(ball.second.x) * ball.second.y}; glm::vec2 step = sb::velocity_to_delta(ball.second);
ball.first.transformation(glm::translate(glm::vec3{step.x, step.y, 0.0f}) * ball.first.transformation()); ball.first.transformation(glm::translate(glm::vec3{step.x, step.y, 0.0f}) * ball.first.transformation());
if (ball.second.y > 0) if (ball.second.y > 0)
{ {

3
src/Pepy.hpp
View File

@ -3,7 +3,7 @@
#ifndef PEPY_H_ #ifndef PEPY_H_
#define PEPY_H_ #define PEPY_H_
/* Enable swizzling in GLM */ /* GLM */
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtx/compatibility.hpp> #include <glm/gtx/compatibility.hpp>
@ -11,6 +11,7 @@
/* [SPACE BOX] headers */ /* [SPACE BOX] headers */
#include "Game.hpp" #include "Game.hpp"
#include "VBO.hpp" #include "VBO.hpp"
#include "math.hpp"
/* Project headers */ /* Project headers */
#include "Model.hpp" #include "Model.hpp"