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

Little improvements.

Browse Source
This commit is contained in:
Quentin BAZIN 2013-05-22 23:43:05 +02:00
parent 89a4b19e1c
commit 8f721db68c
19 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AUTHORS
View File

@ -1,6 +1,9 @@
# These persons made anything for Eplith # These persons made anything for KubKraft
-- Original creator -- -- Original creator --
Quentin BAZIN <quent42340@gmail.com> * Quentin Bazin <quent42340@gmail.com>
-- Other people -- -- Other people --
smealum - For help:
Synthesis * smealum
* Synthesis
- For SimplexNoise implementation:
* Stefan Gustavson <stegu@itn.liu.se>

2
README.textile
View File

@ -1,5 +1,5 @@
h1. KubKraft h1. KubKraft
h2. By Quent42340 h2. By Quentin Bazin (aka. Quent42340)
* KubKraft is a Minecraft-like game. * KubKraft is a Minecraft-like game.

2
include/chunk.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/config.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/cube.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/game.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/init.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/map.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/mapManager.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/player.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
include/types.h
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

30
source/chunk.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -174,33 +174,19 @@ float Chunk::getTexOffsetU(int type, int i, Cube *cube) {
Cube *higherCube = NULL; Cube *higherCube = NULL;
if(cube->z() < m_z + CHUNK_HEIGHT - 1) higherCube = getCube(cube->x() - m_x, cube->y() - m_y, cube->z() - m_z + 1); if(cube->z() < m_z + CHUNK_HEIGHT - 1) higherCube = getCube(cube->x() - m_x, cube->y() - m_y, cube->z() - m_z + 1);
else { else if(m_surroundingChunks[4] != NULL) higherCube = m_surroundingChunks[4]->getCube(cube->x() - m_x, cube->y() - m_y, 0);
if(m_surroundingChunks[4] != NULL) higherCube = m_surroundingChunks[4]->getCube(cube->x() - m_x, cube->y() - m_y, 0);
}
if((higherCube == NULL) || (higherCube->type() == 0)) { if((higherCube == NULL) || (higherCube->type() == 0)) {
if((i == 0) || (i == 1) || (i == 2) || (i == 3)) { if((i == 0) || (i == 1) || (i == 2) || (i == 3))
return type * 0.125; return type * 0.125;
} else if(i == 4) return (type + 1) * 0.125;
else if(i == 4) { else return (type - 1) * 0.125;
return (type + 1) * 0.125; } else return (type - 1) * 0.125;
} else { } else return (type - 1) * 0.125;
return (type - 1) * 0.125;
}
} else {
return (type - 1) * 0.125;
}
} else {
return (type - 1) * 0.125;
}
} }
float Chunk::getTexOffsetV(int type) { float Chunk::getTexOffsetV(int type) {
if(type > 8) { return 1 - ((type >> 3) + 1) * 0.125;
//type <<= 3; // Here 8 ( remember x * 8 == x << 3 ) is the texture image width
return 1 - ((type >> 3) + 1) * 0.125;
}
return 0.875;
} }
void Chunk::refreshVBO() { void Chunk::refreshVBO() {

2
source/cube.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
source/game.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
source/init.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
source/main.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

20
source/map.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -84,7 +84,7 @@ Map::Map(u16 width, u16 depth, u16 height) {
if(zz < dirtHeight) m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = 1; if(zz < dirtHeight) m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = 1;
else if(zz > dirtHeight && zz < dirtHeight + 3) m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = rand()%2 + 1; else if(zz > dirtHeight && zz < dirtHeight + 3) m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = rand()%2 + 1;
else m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = 2; else m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = 2;
if(zz < 16 && cavePerlin > 0.01 && cavePerlin < 0.05) m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = 10; if(zz < 16 && cavePerlin > 0.01 && cavePerlin < 0.02) m_map[_MAP_POS(xC + (xx << 3), yC + (yy << 3), zz)] = 10;
} }
if(zz == 0) { if(zz == 0) {
@ -276,15 +276,15 @@ void Map::render() {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glEnableClientState(GL_VERTEX_ARRAY); extractFrustum();
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glEnableClientState(GL_COLOR_ARRAY);
currentChunk = findNearestChunk(Game::player->x(), Game::player->y(), Game::player->z()); currentChunk = findNearestChunk(Game::player->x(), Game::player->y(), Game::player->z());
//uint32_t time = SDL_GetTicks(); //uint32_t time = SDL_GetTicks();
extractFrustum(); glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glEnableClientState(GL_COLOR_ARRAY);
for(int i = 0 ; i < ((m_width >> 3) * (m_depth >> 3) * (m_height >> 3)); i++) { for(int i = 0 ; i < ((m_width >> 3) * (m_depth >> 3) * (m_height >> 3)); i++) {
if(cubeInFrustum(m_chunks[i]->x(), m_chunks[i]->y(), m_chunks[i]->z(), 8)) { if(cubeInFrustum(m_chunks[i]->x(), m_chunks[i]->y(), m_chunks[i]->z(), 8)) {
@ -292,15 +292,15 @@ void Map::render() {
} }
} }
glDisableClientState(GL_COLOR_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisableClientState(GL_VERTEX_ARRAY);
//time = SDL_GetTicks() - time; //time = SDL_GetTicks() - time;
//cout << "Render time: " << time << " ms" << endl; //cout << "Render time: " << time << " ms" << endl;
testCubes(); testCubes();
glDisableClientState(GL_COLOR_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisableClientState(GL_VERTEX_ARRAY);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
if ((currentChunk != NULL) && (selectedCube->x() != -1) && (selectedCube->selectedFace() >= 0) && (selectedCube->selectedFace() < 6)) { if ((currentChunk != NULL) && (selectedCube->x() != -1) && (selectedCube->selectedFace() >= 0) && (selectedCube->selectedFace() < 6)) {

2
source/mapManager.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
source/player.cpp
View File

@ -1,7 +1,7 @@
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------
KubKraft KubKraft
Copyright (C) 2012 Quent42340 <quent42340@gmail.com> Copyright (C) 2013 Quentin Bazin <quent42340@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by