浏览代码

Enabled MULTITEXTURE in debug builds

Thomas Buck 11 年前
父节点
当前提交
ae24b5951f
共有 4 个文件被更改,包括 7 次插入2 次删除
  1. 1
    1
      CMakeLists.txt
  2. 1
    0
      TODO.md
  3. 0
    1
      src/Entity.cpp
  4. 5
    0
      src/Room.cpp

+ 1
- 1
CMakeLists.txt 查看文件

58
 # Flags for Debug build
58
 # Flags for Debug build
59
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
59
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
60
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
60
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
61
-# set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DMULTITEXTURE")
61
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DMULTITEXTURE")
62
 
62
 
63
 # Flags for Releasae builds
63
 # Flags for Releasae builds
64
 set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -DNDEBUG")
64
 set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -DNDEBUG")

+ 1
- 0
TODO.md 查看文件

9
     * Use std::strings
9
     * Use std::strings
10
     * Rewrite Console and use operator << to write to the console?
10
     * Rewrite Console and use operator << to write to the console?
11
 * SDL_TTF 2.0.12+ can do line breaks, use it: http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688
11
 * SDL_TTF 2.0.12+ can do line breaks, use it: http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688
12
+* Mesh has 2 different approaches of storing the same data (eg. mColors and mColorArray), but half of ‘em isn’t implemented. Unify this, probably even reusing the Mesh class for the model_meshes...
12
 
13
 
13
 ## Changes
14
 ## Changes
14
 
15
 

+ 0
- 1
src/Entity.cpp 查看文件

104
             return;
104
             return;
105
     }
105
     }
106
 
106
 
107
-    //room = getRoomByLocation(x, y, z);
108
     roomNew = getWorld().getRoomByLocation(room, x, y, z);
107
     roomNew = getWorld().getRoomByLocation(room, x, y, z);
109
 
108
 
110
     if (roomNew == -1) { // Will we hit a portal?
109
     if (roomNew == -1) { // Will we hit a portal?

+ 5
- 0
src/Room.cpp 查看文件

13
 #include "Render.h"
13
 #include "Render.h"
14
 #include "Room.h"
14
 #include "Room.h"
15
 
15
 
16
+#ifdef MULTITEXTURE
17
+#include <map>
18
+extern std::map<int, int> gMapTex2Bump;
19
+#endif
20
+
16
 Room::Room(TombRaider &tr, unsigned int index) {
21
 Room::Room(TombRaider &tr, unsigned int index) {
17
     vec3_t box[2];
22
     vec3_t box[2];
18
     Matrix transform;
23
     Matrix transform;

正在加载...
取消
保存