serviere/EnginPasTangible
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: serviere:2ee55100e589acfb6adf9820819e79aa84672df7
Branches Tags
serviere:master
..
compare: serviere:89c0b0b920c42bf8a6905e0a33f128fa5f5f6ce7
Branches Tags
serviere:master

No commits in common. "2ee55100e589acfb6adf9820819e79aa84672df7" and "89c0b0b920c42bf8a6905e0a33f128fa5f5f6ce7" have entirely different histories.
2ee55100e5 ... 89c0b0b920

1 changed files with 40 additions and 82 deletions
Show stats Expand all files Collapse all files

122
main.c
View file

@ -18,7 +18,7 @@
* *
* For instance if you want fps and position set the value to 2*3=6 * For instance if you want fps and position set the value to 2*3=6
*/ */
#define DEBUG_MODE 1 #define DEBUG_MODE 5
GLuint screenWidth = 720, screenHeight = 480; GLuint screenWidth = 720, screenHeight = 480;
const GLFWvidmode* mode; const GLFWvidmode* mode;
@ -44,13 +44,6 @@ float ez[3] = {0};
float ex[3] = {0}; float ex[3] = {0};
float ey[3] = {0}; float ey[3] = {0};
bool upar = false;
bool downar = false;
bool leftar = false;
bool rightar = false;
bool forwardar = false;
bool backwardar = false;
float fovValue=1.0; float fovValue=1.0;
//283=3.14/2 * 180 //283=3.14/2 * 180
const int maxYmouse = 283; const int maxYmouse = 283;
@ -80,59 +73,49 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
multiplicatorFov=1.; multiplicatorFov=1.;
} }
if (action == GLFW_PRESS) { if (!action == GLFW_PRESS)
if (key == GLFW_KEY_ESCAPE) return;
if (key == GLFW_KEY_ESCAPE)
{
//glfwSetWindowShouldClose(window, GLFW_TRUE);
pause=!pause;
printf(pause ? "En pause\n" : "En fonctionnement\n");
if (pause)
{ {
//glfwSetWindowShouldClose(window, GLFW_TRUE); glfwSetWindowTitle(window, "EnginPasTangible (En pause)");
pause=!pause; glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
printf(pause ? "En pause\n" : "En fonctionnement\n");
if (pause)
{
glfwSetWindowTitle(window, "EnginPasTangible (En pause)");
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
}
else
{
glfwSetWindowTitle(window, APPNAMEVERSION);
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
}
} }
if (key == GLFW_KEY_BACKSPACE) else
glfwSetWindowShouldClose(window, GLFW_TRUE); {
if (key == GLFW_KEY_SPACE) glfwSetWindowTitle(window, APPNAMEVERSION);
upar = true; glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
if (key == GLFW_KEY_LEFT_CONTROL)
downar = true;
if (key == GLFW_KEY_UP || key == GLFW_KEY_W) {
forwardar = true;
}
if (key == GLFW_KEY_DOWN || key == GLFW_KEY_S ) {
backwardar = true;
}
if (key == GLFW_KEY_RIGHT || key == GLFW_KEY_D) {
rightar = true;
}
if (key == GLFW_KEY_LEFT || key == GLFW_KEY_A ) {
leftar = true;
} }
} }
else if (action == GLFW_RELEASE) { if (key == GLFW_KEY_BACKSPACE)
if (key == GLFW_KEY_SPACE) glfwSetWindowShouldClose(window, GLFW_TRUE);
upar = false; if (key == GLFW_KEY_SPACE && stateControl != GLFW_PRESS)
if (key == GLFW_KEY_LEFT_CONTROL) camPosY += speed;
downar = false; if (key == GLFW_KEY_SPACE && stateControl == GLFW_PRESS)
if (key == GLFW_KEY_UP || key == GLFW_KEY_W) { camPosY -= speed;
forwardar = false; if (key == GLFW_KEY_UP || key == GLFW_KEY_W) {
} camPosX += speed*ez[0];
if (key == GLFW_KEY_DOWN || key == GLFW_KEY_S ) { camPosY += speed*ez[1];
backwardar = false; camPosZ += speed*ez[2];
} }
if (key == GLFW_KEY_RIGHT || key == GLFW_KEY_D) { if (key == GLFW_KEY_DOWN || key == GLFW_KEY_S ) {
rightar = false; camPosX -= speed*ez[0];
} camPosY -= speed*ez[1];
if (key == GLFW_KEY_LEFT || key == GLFW_KEY_A ) { camPosZ -= speed*ez[2];
leftar = false; }
} if (key == GLFW_KEY_RIGHT || key == GLFW_KEY_D) {
camPosX += speed*ex[0];
camPosY += speed*ex[1];
camPosZ += speed*ex[2];
}
if (key == GLFW_KEY_LEFT || key == GLFW_KEY_A ) {
camPosX -= speed*ex[0];
camPosY -= speed*ex[1];
camPosZ -= speed*ex[2];
} }
} }
@ -273,31 +256,6 @@ int main (){
ey[2] = ex[0] * ez[1] - ex[1] * ez[0]; ey[2] = ex[0] * ez[1] - ex[1] * ez[0];
//crossProduct(ex,ez); //crossProduct(ex,ez);
if (upar)
camPosY += speed;
if (downar)
camPosY -= speed;
if (forwardar) {
camPosX += speed*ez[0];
camPosY += speed*ez[1];
camPosZ += speed*ez[2];
}
if (backwardar) {
camPosX -= speed*ez[0];
camPosY -= speed*ez[1];
camPosZ -= speed*ez[2];
}
if (rightar) {
camPosX += speed*ex[0];
camPosY += speed*ex[1];
camPosZ += speed*ex[2];
}
if (leftar) {
camPosX -= speed*ex[0];
camPosY -= speed*ex[1];
camPosZ -= speed*ex[2];
}
currentTime = glfwGetTime(); currentTime = glfwGetTime();
deltaTime = currentTime - lastFrame; deltaTime = currentTime - lastFrame;
lastFrame = currentTime; lastFrame = currentTime;