Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little modifications.

Browse Source
This commit is contained in:
Quentin BAZIN 2013-03-02 03:43:37 +01:00
parent 3f77b81c52
commit 4535411f73
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ LDFLAGS := -g -Wl
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# Any extra libraries you wish to link with your project # Any extra libraries you wish to link with your project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := -lglfw -lGL -lGLU -lSDL -lXrandr LIBS := -lglfw -lGLEW -lGL -lGLU -lSDL -lXrandr
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing

3
source/cube.cpp
View File

@ -22,8 +22,7 @@
#include <map> #include <map>
#include <SDL/SDL.h> #include <SDL/SDL.h>
#include <GL/gl.h> #include <GL/glew.h>
#include <GL/glu.h>
#include "types.h" #include "types.h"
#include "map.h" #include "map.h"

2
source/player.cpp
View File

@ -72,7 +72,7 @@ void Player::turnV(float angle) {
} }
void Player::fly() { void Player::fly() {
if(m_eyeheight < 20) m_eyeheight += 0.05; if(m_eyeheight < 256) m_eyeheight += 0.05;
} }
void Player::land() { void Player::land() {

7
source/scene.cpp
View File

@ -235,7 +235,7 @@ Cube *Scene::selectedCube;
Scene::Scene() { Scene::Scene() {
//player = new Player(7, 7, 5, 90); //player = new Player(7, 7, 5, 90);
player = new Player(4, 4, 2, 90); player = new Player(4, 4, 18, 90);
loadTextures(); loadTextures();
@ -243,6 +243,11 @@ Scene::Scene() {
m_chunks.push_back(new Chunk(16, 0, 0, m_textures)); m_chunks.push_back(new Chunk(16, 0, 0, m_textures));
m_chunks.push_back(new Chunk(0, 16, 0, m_textures)); m_chunks.push_back(new Chunk(0, 16, 0, m_textures));
m_chunks.push_back(new Chunk(16, 16, 0, m_textures)); m_chunks.push_back(new Chunk(16, 16, 0, m_textures));
m_chunks.push_back(new Chunk(0, 32, 0, m_textures));
m_chunks.push_back(new Chunk(32, 0, 0, m_textures));
m_chunks.push_back(new Chunk(32, 16, 0, m_textures));
m_chunks.push_back(new Chunk(16, 32, 0, m_textures));
m_chunks.push_back(new Chunk(32, 32, 0, m_textures));
currentChunk = findNearestChunk(player->x(), player->y(), player->z()); currentChunk = findNearestChunk(player->x(), player->y(), player->z());