Changeset 658
- Timestamp:
- Feb 17, 2011, 7:06:33 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r644 r658 44 44 AC_ARG_ENABLE(release, 45 45 [ --enable-release build final release of the game (default no)]) 46 AC_ARG_ENABLE(experimental, 47 [ --enable-experimental experimental build (default no)]) 46 48 47 49 AC_ARG_ENABLE(cppunit, … … 51 53 52 54 if test "${enable_debug}" = "yes"; then 53 AC_DEFINE( _DEBUG, 1, Define to 1 to activate debug)55 AC_DEFINE(LOL_DEBUG, 1, Define to 1 to activate debug) 54 56 OPT="-O0" 55 57 else … … 58 60 59 61 if test "${enable_release}" = "yes"; then 60 AC_DEFINE( FINAL_RELEASE, 1, Define to 1 to activate final release)62 AC_DEFINE(LOL_RELEASE, 1, Define to 1 to activate final release) 61 63 REL="" 62 64 else 63 65 REL="-g" 66 fi 67 68 if test "${enable_experimental}" = "yes"; then 69 AC_DEFINE(LOL_EXPERIMENTAL, 1, Define to 1 to activate experimental build) 64 70 fi 65 71 -
trunk/src/core.h
r653 r658 16 16 #if !defined __DH_CORE_H__ 17 17 #define __DH_CORE_H__ 18 19 // Temporary stuff20 //#define SHADER_CRAP 121 18 22 19 // Base types -
trunk/src/dict.cpp
r420 r658 42 42 ~DictData() 43 43 { 44 #if ! FINAL_RELEASE44 #if !LOL_RELEASE 45 45 if (nentities) 46 46 fprintf(stderr, "ERROR: still %i entities in dict\n", nentities); -
trunk/src/entity.cpp
r221 r658 28 28 destroy(0) 29 29 { 30 #if ! FINAL_RELEASE30 #if !LOL_RELEASE 31 31 state = STATE_IDLE; 32 32 #endif … … 38 38 Entity::~Entity() 39 39 { 40 #if ! FINAL_RELEASE40 #if !LOL_RELEASE 41 41 if (!destroy) 42 42 fprintf(stderr, "ERROR: entity destructor called directly\n"); … … 51 51 void Entity::TickGame(float deltams) 52 52 { 53 #if ! FINAL_RELEASE53 #if !LOL_RELEASE 54 54 if (state != STATE_PRETICK_GAME) 55 55 fprintf(stderr, "ERROR: invalid entity game tick\n"); … … 60 60 void Entity::TickDraw(float deltams) 61 61 { 62 #if ! FINAL_RELEASE62 #if !LOL_RELEASE 63 63 if (state != STATE_PRETICK_DRAW) 64 64 fprintf(stderr, "ERROR: invalid entity draw tick\n"); -
trunk/src/entity.h
r328 r658 63 63 static int const ALLGROUP_END = DRAWGROUP_END; 64 64 65 #if ! FINAL_RELEASE65 #if !LOL_RELEASE 66 66 enum 67 67 { -
trunk/src/sample.cpp
r419 r658 48 48 if (!data->chunk) 49 49 { 50 #if ! FINAL_RELEASE50 #if !LOL_RELEASE 51 51 fprintf(stderr, "ERROR: could not load %s\n", path); 52 52 #endif -
trunk/src/scene.cpp
r657 r658 36 36 }; 37 37 38 #if SHADER_CRAP38 #if LOL_EXPERIMENTAL 39 39 extern GLuint prog; 40 40 #endif … … 135 135 qsort(data->tiles, data->ntiles, sizeof(Tile), SceneData::Compare); 136 136 137 #if SHADER_CRAP137 #if LOL_EXPERIMENTAL 138 138 float *vertices = new float[18]; 139 139 vertices[0] = -0.5f; vertices[1] = 0.5f; vertices[2] = 0.0f; -
trunk/src/ticker.cpp
r639 r658 40 40 ~TickerData() 41 41 { 42 #if ! FINAL_RELEASE42 #if !LOL_RELEASE 43 43 if (nentities) 44 44 fprintf(stderr, "ERROR: still %i entities in ticker\n", nentities); … … 95 95 void Ticker::Ref(Entity *entity) 96 96 { 97 #if ! FINAL_RELEASE97 #if !LOL_RELEASE 98 98 if (!entity) 99 99 { … … 126 126 int Ticker::Unref(Entity *entity) 127 127 { 128 #if ! FINAL_RELEASE128 #if !LOL_RELEASE 129 129 if (!entity) 130 130 { … … 193 193 if (e->ref) 194 194 { 195 #if ! FINAL_RELEASE195 #if !LOL_RELEASE 196 196 fprintf(stderr, "ERROR: poking %s\n", e->GetName()); 197 197 #endif … … 200 200 } 201 201 202 #if ! FINAL_RELEASE202 #if !LOL_RELEASE 203 203 if (n) 204 204 fprintf(stderr, "ERROR: %i entities stuck after %i frames, " … … 261 261 if (!e->destroy) 262 262 { 263 #if ! FINAL_RELEASE263 #if !LOL_RELEASE 264 264 if (e->state != Entity::STATE_IDLE) 265 265 fprintf(stderr, "ERROR: entity not idle for game tick\n"); … … 267 267 #endif 268 268 e->TickGame(data->deltams); 269 #if ! FINAL_RELEASE269 #if !LOL_RELEASE 270 270 if (e->state != Entity::STATE_POSTTICK_GAME) 271 271 fprintf(stderr, "ERROR: entity missed super game tick\n"); … … 302 302 if (!e->destroy) 303 303 { 304 #if ! FINAL_RELEASE304 #if !LOL_RELEASE 305 305 if (e->state != Entity::STATE_IDLE) 306 306 fprintf(stderr, "ERROR: entity not idle for draw tick\n"); … … 308 308 #endif 309 309 e->TickDraw(data->deltams); 310 #if ! FINAL_RELEASE310 #if !LOL_RELEASE 311 311 if (e->state != Entity::STATE_POSTTICK_DRAW) 312 312 fprintf(stderr, "ERROR: entity missed super draw tick\n"); -
trunk/src/tiler.cpp
r645 r658 27 27 public: 28 28 TilerData() 29 #if ! FINAL_RELEASE29 #if !LOL_RELEASE 30 30 : lasterror(-1) 31 31 #endif … … 34 34 private: 35 35 Dict tilesets; 36 #if ! FINAL_RELEASE36 #if !LOL_RELEASE 37 37 int lasterror; 38 38 #endif … … 54 54 TileSet *tileset = new TileSet(path, size, count, dilate); 55 55 data->tilesets.SetEntity(id, tileset); 56 #if ! FINAL_RELEASE56 #if !LOL_RELEASE 57 57 if (id == data->lasterror) 58 58 data->lasterror = -1; … … 71 71 { 72 72 TileSet *tileset = (TileSet *)data->tilesets.GetEntity(id - 1); 73 #if ! FINAL_RELEASE73 #if !LOL_RELEASE 74 74 if (!tileset) 75 75 { … … 84 84 { 85 85 TileSet *tileset = (TileSet *)data->tilesets.GetEntity(id - 1); 86 #if ! FINAL_RELEASE86 #if !LOL_RELEASE 87 87 if (!tileset) 88 88 { … … 99 99 100 100 TileSet *tileset = (TileSet *)data->tilesets.GetEntity(id); 101 #if ! FINAL_RELEASE101 #if !LOL_RELEASE 102 102 if (!tileset) 103 103 { … … 117 117 118 118 TileSet *tileset = (TileSet *)data->tilesets.GetEntity(id); 119 #if ! FINAL_RELEASE119 #if !LOL_RELEASE 120 120 if (!tileset) 121 121 { -
trunk/src/tileset.cpp
r645 r658 71 71 if (!data->img) 72 72 { 73 #if ! FINAL_RELEASE73 #if !LOL_RELEASE 74 74 fprintf(stderr, "ERROR: could not load %s\n", path); 75 75 #endif -
trunk/src/video.cpp
r657 r658 29 29 #include "core.h" 30 30 31 #if SHADER_CRAP31 #if LOL_EXPERIMENTAL 32 32 GLuint prog, sh1, sh2; 33 33 GLint uni_m1, uni_m2, uni_m3; … … 36 36 #endif 37 37 38 #if SHADER_CRAP38 #if LOL_EXPERIMENTAL 39 39 static char const *vertexshader = 40 40 "#version 130\n" … … 86 86 glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); 87 87 88 #if SHADER_CRAP88 #if LOL_EXPERIMENTAL 89 89 sh1 = glCreateShader(GL_VERTEX_SHADER); 90 90 glShaderSource(sh1, 1, &vertexshader, NULL); … … 123 123 void Video::SetFov(float theta) 124 124 { 125 #if SHADER_CRAP125 #if LOL_EXPERIMENTAL 126 126 float width = GetWidth(); 127 127 float height = GetHeight(); … … 186 186 void Video::Clear() 187 187 { 188 #if SHADER_CRAP188 #if LOL_EXPERIMENTAL 189 189 glViewport(0, 0, GetWidth(), GetHeight()); 190 190 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); … … 214 214 #endif 215 215 216 #if SHADER_CRAP216 #if LOL_EXPERIMENTAL 217 217 static float time; 218 218 time += 0.01f; … … 225 225 void Video::Destroy() 226 226 { 227 #if SHADER_CRAP227 #if LOL_EXPERIMENTAL 228 228 glDetachShader(prog, sh1); 229 229 glDetachShader(prog, sh2); -
trunk/win32/deushax.vcxproj
r648 r658 122 122 <WarningLevel>Level3</WarningLevel> 123 123 <Optimization>Disabled</Optimization> 124 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE; %(PreprocessorDefinitions)</PreprocessorDefinitions>124 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LOL_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 125 125 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 126 126 </ClCompile> -
trunk/win32/editor.vcxproj
r648 r658 122 122 <WarningLevel>Level3</WarningLevel> 123 123 <Optimization>Disabled</Optimization> 124 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE; %(PreprocessorDefinitions)</PreprocessorDefinitions>124 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LOL_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 125 125 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 126 126 </ClCompile> -
trunk/win32/monsterz.vcxproj
r648 r658 131 131 <WarningLevel>Level3</WarningLevel> 132 132 <Optimization>Disabled</Optimization> 133 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE; %(PreprocessorDefinitions)</PreprocessorDefinitions>133 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LOL_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 134 134 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 135 135 </ClCompile>
Note: See TracChangeset
for help on using the changeset viewer.