Zigonnage et tests à saveur de Twin Peaks.
This commit is contained in:
Marc-Eric Martel
parent
c34d0a0ef5
commit
2324ef071b
@ -47,7 +47,9 @@ void Engine::DeInit()
|
||||
|
||||
void Engine::LoadResource()
|
||||
{
|
||||
LoadTexture(m_textureFloor, TEXTURE_PATH "checker.png");
|
||||
LoadTexture(m_textureFloor, TEXTURE_PATH "floortile.png");
|
||||
LoadTexture(m_textureSkybox, TEXTURE_PATH "curtains.png");
|
||||
LoadTexture(m_textureCube, TEXTURE_PATH "kyle.png");
|
||||
}
|
||||
|
||||
void Engine::UnloadResource()
|
||||
@ -66,6 +68,49 @@ void Engine::Render(float elapsedTime)
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
|
||||
|
||||
// Skybox
|
||||
m_textureSkybox.Bind();
|
||||
glDepthFunc(GL_ALWAYS);
|
||||
glBegin(GL_QUADS);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(10.f, 10.f, 10.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-10.f, 10.f, 10.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-10.f, -10.f, 10.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(10.f, -10.f, 10.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(10.f, -10.f, -10.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-10.f, -10.f, -10.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-10.f, 10.f, -10.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(10.f, 10.f, -10.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(-10.f, 10.f, 10.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-10.f, 10.f, -10.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-10.f, -10.f, -10.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(-10.f, -10.f, 10.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(10.f, 10.f, -10.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(10.f, 10.f, 10.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(10.f, -10.f, 10.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(10.f, -10.f, -10.f);
|
||||
glEnd();
|
||||
|
||||
// Plancher
|
||||
// Les vertex doivent etre affiches dans le sens anti-horaire (CCW)
|
||||
m_textureFloor.Bind();
|
||||
@ -81,11 +126,72 @@ void Engine::Render(float elapsedTime)
|
||||
glTexCoord2f(0, nbRep);
|
||||
glVertex3f(-100.f, -2.f, -100.f);
|
||||
glEnd();
|
||||
|
||||
// Cube
|
||||
glTranslatef(0.f, 0.f, -7.f);
|
||||
m_textureCube.Bind();
|
||||
glBegin(GL_QUADS);
|
||||
glDepthFunc(GL_GREATER);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(1.f, 1.f, -1.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-1.f, 1.f, -1.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-1.f, 1.f, 1.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(1.f, 1.f, 1.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(1.f, -1.f, 1.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-1.f, -1.f, 1.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-1.f, -1.f, -1.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(1.f, -1.f, -1.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(1.f, 1.f, 1.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-1.f, 1.f, 1.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-1.f, -1.f, 1.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(1.f, -1.f, 1.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(1.f, -1.f, -1.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-1.f, -1.f, -1.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-1.f, 1.f, -1.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(1.f, 1.f, -1.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(-1.f, 1.f, 1.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(-1.f, 1.f, -1.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(-1.f, -1.f, -1.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(-1.f, -1.f, 1.f);
|
||||
|
||||
glTexCoord2f(1, 0);
|
||||
glVertex3f(1.f, 1.f, -1.f);
|
||||
glTexCoord2f(0, 0);
|
||||
glVertex3f(1.f, 1.f, 1.f);
|
||||
glTexCoord2f(0, 1);
|
||||
glVertex3f(1.f, -1.f, 1.f);
|
||||
glTexCoord2f(1, 1);
|
||||
glVertex3f(1.f, -1.f, -1.f);
|
||||
glEnd();
|
||||
}
|
||||
|
||||
void Engine::KeyPressEvent(unsigned char key)
|
||||
{
|
||||
switch(key)
|
||||
switch (key)
|
||||
{
|
||||
case 36: // ESC
|
||||
Stop();
|
||||
@ -127,11 +233,11 @@ void Engine::KeyPressEvent(unsigned char key)
|
||||
|
||||
void Engine::KeyReleaseEvent(unsigned char key)
|
||||
{
|
||||
switch(key)
|
||||
switch (key)
|
||||
{
|
||||
case 24: // Y
|
||||
m_wireframe = !m_wireframe;
|
||||
if(m_wireframe)
|
||||
if (m_wireframe)
|
||||
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
|
||||
else
|
||||
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
||||
@ -141,11 +247,11 @@ void Engine::KeyReleaseEvent(unsigned char key)
|
||||
m_keyW = false;
|
||||
break;
|
||||
case 0: // A
|
||||
std::cout << "rA "<< std::endl;
|
||||
std::cout << "rA " << std::endl;
|
||||
m_keyA = false;
|
||||
break;
|
||||
case 18: // S
|
||||
std::cout << "rS "<< std::endl;
|
||||
std::cout << "rS " << std::endl;
|
||||
m_keyS = false;
|
||||
break;
|
||||
case 3: // D
|
||||
@ -162,7 +268,7 @@ void Engine::MouseMoveEvent(int x, int y)
|
||||
// dans une boucle infinie où l'appel à CenterMouse génère un
|
||||
// MouseMoveEvent, qui rapelle CenterMouse qui rapelle un autre
|
||||
// MouseMoveEvent, etc
|
||||
if(x == (Width() / 2) && y == (Height() / 2))
|
||||
if (x == (Width() / 2) && y == (Height() / 2))
|
||||
return;
|
||||
|
||||
CenterMouse();
|
||||
@ -179,10 +285,10 @@ void Engine::MouseReleaseEvent(const MOUSE_BUTTON& button, int x, int y)
|
||||
bool Engine::LoadTexture(Texture& texture, const std::string& filename, bool stopOnError)
|
||||
{
|
||||
texture.Load(filename);
|
||||
if(!texture.IsValid())
|
||||
if (!texture.IsValid())
|
||||
{
|
||||
std::cerr << "Unable to load texture (" << filename << ")" << std::endl;
|
||||
if(stopOnError)
|
||||
if (stopOnError)
|
||||
Stop();
|
||||
|
||||
return false;
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include "define.h"
|
||||
#include "openglcontext.h"
|
||||
#include "texture.h"
|
||||
#include "transformation.h"
|
||||
|
||||
class Engine : public OpenglContext
|
||||
{
|
||||
@ -27,6 +28,8 @@ private:
|
||||
bool m_wireframe = false;
|
||||
|
||||
Texture m_textureFloor;
|
||||
Texture m_textureSkybox;
|
||||
Texture m_textureCube;
|
||||
|
||||
bool m_keyW = false;
|
||||
bool m_keyA = false;
|
||||
|
||||
BIN
mcclone/media/textures/curtain.png
Normal file
BIN
mcclone/media/textures/curtain.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
BIN
mcclone/media/textures/curtains.png
Normal file
BIN
mcclone/media/textures/curtains.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 660 KiB |
BIN
mcclone/media/textures/floortile.png
Normal file
BIN
mcclone/media/textures/floortile.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
BIN
mcclone/media/textures/kyle.png
Normal file
BIN
mcclone/media/textures/kyle.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 313 KiB |
@ -152,7 +152,7 @@ void OpenglContext::ShowCrossCursor() const
|
||||
|
||||
void OpenglContext::InitWindow(int width, int height)
|
||||
{
|
||||
m_app.create(sf::VideoMode(width, height, 32), m_title.c_str(), m_fullscreen ? sf::Style::Fullscreen : (sf::Style::Resize|sf::Style::Close), sf::ContextSettings(32, 8, 0));
|
||||
m_app.create(sf::VideoMode(width, height, 32), m_title.c_str(), m_fullscreen ? sf::Style::Fullscreen : (sf::Style::Resize|sf::Style::Close), sf::ContextSettings(32, 8, 4));
|
||||
}
|
||||
|
||||
OpenglContext::MOUSE_BUTTON OpenglContext::ConvertMouseButton(sf::Mouse::Button button) const
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user