2
0
Эх сурвалжийг харах

THIS REVISION WONT COMPILE

Panagiotis Christopoulos Charitos 16 жил өмнө
parent
commit
f8443a34d0

+ 285 - 285
build/debug/Makefile

@@ -1,19 +1,19 @@
 CXX = g++
 COMMONFLAGS = 
-CFLAGS = $(COMMONFLAGS) -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -pipe -O0 -g3 -pg `sdl-config --cflags` -D_DEBUG_ -D_TERMINAL_COLORING_ -D_PLATFORM_LINUX_
+CFLAGS = $(COMMONFLAGS) -c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -pipe -O0 -g3 -pg `sdl-config --cflags` -D_DEBUG_ -D_TERMINAL_COLORING__ -D_PLATFORM_LINUX_
 PHFLAGS = $(CFLAGS) -x c++-header
-LFLAGS = $(COMMONFLAGS) -lGL -lGLU -lSDL_image `sdl-config --static-libs` -ljpeg -lGLEW
+LFLAGS = $(COMMONFLAGS) -L/usr/lib -L/usr/local/lib -Wl,-rpath,/usr/local/lib,-Bstatic -lSDL -lSDL_image -Wl,-Bdynamic -lGL -lGLU -ljpeg -lGLEW
 EXECUTABLE = AnKi.bin
-INCPATH = -I../../src/math/ -I../../src/tokenizer/ -I../../src/uncategorized/ -I../../src/ -I../../src/renderer/ -I../../src/scene/ -I../../src/ui/ -I../../src/resources/ -I../../src/utility/ -I../../src/controllers/ 
-SOURCES = ../../src/tokenizer//scanner.cpp ../../src/uncategorized//input.cpp ../../src/uncategorized//skybox.cpp ../../src/uncategorized//particles.cpp ../../src/uncategorized//memory.cpp ../../src/uncategorized//engine_class.cpp ../../src/uncategorized//collision.cpp ../../src/uncategorized//map.cpp ../../src//main.cpp ../../src/renderer//r_ms.cpp ../../src/renderer//r_pps_hdr.cpp ../../src/renderer//r_pps.cpp ../../src/renderer//r_is_shadows.cpp ../../src/renderer//r_bs.cpp ../../src/renderer//r_ms_earlyz.cpp ../../src/renderer//renderer.cpp ../../src/renderer//r_pps_ssao.cpp ../../src/renderer//r_is.cpp ../../src/renderer//r_dbg.cpp ../../src/renderer//r_pps_lscatt.cpp ../../src/renderer//r_bs2.cpp ../../src/scene//mesh_node.cpp ../../src/scene//skel_node.cpp ../../src/scene//light.cpp ../../src/scene//skel_model_node.cpp ../../src/scene//node.cpp ../../src/scene//camera.cpp ../../src/scene//scene.cpp ../../src/ui//ui.cpp ../../src/resources//material.cpp ../../src/resources//texture.cpp ../../src/resources//skel_anim.cpp ../../src/resources//extension.cpp ../../src/resources//shader_parser.cpp ../../src/resources//skeleton.cpp ../../src/resources//resource.cpp ../../src/resources//light_props.cpp ../../src/resources//mesh.cpp ../../src/resources//shader_prog.cpp ../../src/utility//app.cpp ../../src/utility//common.cpp ../../src/utility//util.cpp ../../src/controllers//controller.cpp ../../src/controllers//skel_anim_ctrl.cpp 
-OBJECTS = scanner.o input.o skybox.o particles.o memory.o engine_class.o collision.o map.o main.o r_ms.o r_pps_hdr.o r_pps.o r_is_shadows.o r_bs.o r_ms_earlyz.o renderer.o r_pps_ssao.o r_is.o r_dbg.o r_pps_lscatt.o r_bs2.o mesh_node.o skel_node.o light.o skel_model_node.o node.o camera.o scene.o ui.o material.o texture.o skel_anim.o extension.o shader_parser.o skeleton.o resource.o light_props.o mesh.o shader_prog.o app.o common.o util.o controller.o skel_anim_ctrl.o 
+INCPATH = -I../../src/math/ -I../../src/tokenizer/ -I../../src/uncategorized/ -I../../src/ -I../../src/renderer/ -I../../src/scene/ -I../../src/ui/ -I../../src/resources/ -I../../src/utility/ -I../../src/controllers/ -I../../../bullet_svn/src/ 
+SOURCES = ../../src/tokenizer//scanner.cpp ../../src/uncategorized//input.cpp ../../src/uncategorized//engine_class.cpp ../../src/uncategorized//collision.cpp ../../src/uncategorized//skybox.cpp ../../src/uncategorized//map.cpp ../../src/uncategorized//memory.cpp ../../src/uncategorized//particles.cpp ../../src//main.cpp ../../src/renderer//renderer.cpp ../../src/renderer//r_is_shadows.cpp ../../src/renderer//r_is.cpp ../../src/renderer//r_ms_earlyz.cpp ../../src/renderer//r_pps.cpp ../../src/renderer//r_bs.cpp ../../src/renderer//r_dbg.cpp ../../src/renderer//r_ms.cpp ../../src/renderer//r_pps_lscatt.cpp ../../src/renderer//r_pps_hdr.cpp ../../src/renderer//r_bs2.cpp ../../src/renderer//r_pps_ssao.cpp ../../src/scene//skel_node.cpp ../../src/scene//skel_model_node.cpp ../../src/scene//camera.cpp ../../src/scene//node.cpp ../../src/scene//mesh_node.cpp ../../src/scene//light.cpp ../../src/scene//scene.cpp ../../src/ui//ui.cpp ../../src/resources//extension.cpp ../../src/resources//shader_prog.cpp ../../src/resources//material.cpp ../../src/resources//mesh.cpp ../../src/resources//skel_anim.cpp ../../src/resources//texture.cpp ../../src/resources//resource.cpp ../../src/resources//skeleton.cpp ../../src/resources//light_props.cpp ../../src/resources//shader_parser.cpp ../../src/utility//app.cpp ../../src/utility//common.cpp ../../src/utility//util.cpp ../../src/controllers//skel_anim_ctrl.cpp ../../src/controllers//controller.cpp 
+OBJECTS = scanner.o input.o engine_class.o collision.o skybox.o map.o memory.o particles.o main.o renderer.o r_is_shadows.o r_is.o r_ms_earlyz.o r_pps.o r_bs.o r_dbg.o r_ms.o r_pps_lscatt.o r_pps_hdr.o r_bs2.o r_pps_ssao.o skel_node.o skel_model_node.o camera.o node.o mesh_node.o light.o scene.o ui.o extension.o shader_prog.o material.o mesh.o skel_anim.o texture.o resource.o skeleton.o light_props.o shader_parser.o app.o common.o util.o skel_anim_ctrl.o controller.o 
 PRECOMPILED_HEADERS = 
 
 all: $(PRECOMPILED_HEADERS) $(SOURCES) $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
 	@echo Linking...
-	@$(CXX) $(LFLAGS) $(OBJECTS) -o $(EXECUTABLE)
+	$(CXX) $(OBJECTS) $(LFLAGS) -o $(EXECUTABLE)
 	@echo All Done!
 
 scanner.o: ../../src/tokenizer//scanner.cpp \
@@ -43,39 +43,6 @@ input.o: ../../src/uncategorized//input.cpp \
 	@echo Compiling ../../src/uncategorized//input.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//input.cpp -o input.o
 
-skybox.o: ../../src/uncategorized//skybox.cpp \
- ../../src/uncategorized//skybox.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/resources/texture.h \
- ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/resource.h \
- ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
- ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/scene/scene.h \
- ../../src/uncategorized/skybox.h
-	@echo Compiling ../../src/uncategorized//skybox.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//skybox.cpp -o skybox.o
-
-particles.o: ../../src/uncategorized//particles.cpp
-	@echo Compiling ../../src/uncategorized//particles.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//particles.cpp -o particles.o
-
-memory.o: ../../src/uncategorized//memory.cpp \
- ../../src/uncategorized//memory.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h
-	@echo Compiling ../../src/uncategorized//memory.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//memory.cpp -o memory.o
-
 engine_class.o: ../../src/uncategorized//engine_class.cpp \
  ../../src/uncategorized//engine_class.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h
@@ -102,6 +69,29 @@ collision.o: ../../src/uncategorized//collision.cpp \
 	@echo Compiling ../../src/uncategorized//collision.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//collision.cpp -o collision.o
 
+skybox.o: ../../src/uncategorized//skybox.cpp \
+ ../../src/uncategorized//skybox.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/resources/texture.h \
+ ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/resource.h \
+ ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
+ ../../src/scene/camera.h ../../src/uncategorized/collision.h \
+ ../../src/scene/node.h ../../src/scene/scene.h \
+ ../../src/uncategorized/skybox.h
+	@echo Compiling ../../src/uncategorized//skybox.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//skybox.cpp -o skybox.o
+
 map.o: ../../src/uncategorized//map.cpp ../../src/uncategorized//map.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/uncategorized//collision.h ../../src/math/gmath.h \
@@ -124,6 +114,16 @@ map.o: ../../src/uncategorized//map.cpp ../../src/uncategorized//map.h \
 	@echo Compiling ../../src/uncategorized//map.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//map.cpp -o map.o
 
+memory.o: ../../src/uncategorized//memory.cpp \
+ ../../src/uncategorized//memory.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h
+	@echo Compiling ../../src/uncategorized//memory.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//memory.cpp -o memory.o
+
+particles.o: ../../src/uncategorized//particles.cpp
+	@echo Compiling ../../src/uncategorized//particles.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/uncategorized//particles.cpp -o particles.o
+
 main.o: ../../src//main.cpp ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/uncategorized/input.h \
  ../../src/utility/app.h ../../src/utility/common.h \
@@ -157,31 +157,7 @@ main.o: ../../src//main.cpp ../../src/utility/common.h \
 	@echo Compiling ../../src//main.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src//main.cpp -o main.o
 
-r_ms.o: ../../src/renderer//r_ms.cpp ../../src/renderer//renderer.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
- ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/scene/scene.h \
- ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
- ../../src/resources/mesh.h ../../src/renderer/vbo.h \
- ../../src/renderer//r_private.h ../../src/renderer//fbo.h \
- ../../src/resources/material.h ../../src/scene/mesh_node.h
-	@echo Compiling ../../src/renderer//r_ms.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_ms.cpp -o r_ms.o
-
-r_pps_hdr.o: ../../src/renderer//r_pps_hdr.cpp \
+renderer.o: ../../src/renderer//renderer.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/math/gmath.h \
  ../../src/math/vec2.h ../../src/math/forward_decls.h \
@@ -197,34 +173,11 @@ r_pps_hdr.o: ../../src/renderer//r_pps_hdr.cpp \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
  ../../src/utility/util.h ../../src/utility/common.h \
  ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/resources/resource.h \
- ../../src/resources/texture.h ../../src/scene/scene.h \
- ../../src/uncategorized/skybox.h ../../src/renderer//r_private.h \
- ../../src/renderer//fbo.h
-	@echo Compiling ../../src/renderer//r_pps_hdr.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_hdr.cpp -o r_pps_hdr.o
-
-r_pps.o: ../../src/renderer//r_pps.cpp ../../src/renderer//renderer.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
- ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/resources/resource.h \
- ../../src/resources/texture.h ../../src/renderer//r_private.h \
- ../../src/renderer//fbo.h
-	@echo Compiling ../../src/renderer//r_pps.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps.cpp -o r_pps.o
+ ../../src/scene/node.h ../../src/resources/texture.h \
+ ../../src/scene/scene.h ../../src/uncategorized/skybox.h \
+ ../../src/renderer//r_private.h ../../src/utility/app.h
+	@echo Compiling ../../src/renderer//renderer.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//renderer.cpp -o renderer.o
 
 r_is_shadows.o: ../../src/renderer//r_is_shadows.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
@@ -250,7 +203,7 @@ r_is_shadows.o: ../../src/renderer//r_is_shadows.cpp \
 	@echo Compiling ../../src/renderer//r_is_shadows.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_is_shadows.cpp -o r_is_shadows.o
 
-r_bs.o: ../../src/renderer//r_bs.cpp ../../src/renderer//renderer.h \
+r_is.o: ../../src/renderer//r_is.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
  ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
@@ -269,11 +222,11 @@ r_bs.o: ../../src/renderer//r_bs.cpp ../../src/renderer//renderer.h \
  ../../src/scene/node.h ../../src/scene/scene.h \
  ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
  ../../src/resources/mesh.h ../../src/renderer/vbo.h \
- ../../src/renderer//r_private.h ../../src/resources/resource.h \
- ../../src/renderer//fbo.h ../../src/scene/mesh_node.h \
- ../../src/resources/material.h
-	@echo Compiling ../../src/renderer//r_bs.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_bs.cpp -o r_bs.o
+ ../../src/scene/light.h ../../src/scene/camera.h \
+ ../../src/resources/resource.h ../../src/renderer//r_private.h \
+ ../../src/renderer//fbo.h ../../src/resources/light_props.h
+	@echo Compiling ../../src/renderer//r_is.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_is.cpp -o r_is.o
 
 r_ms_earlyz.o: ../../src/renderer//r_ms_earlyz.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
@@ -298,34 +251,12 @@ r_ms_earlyz.o: ../../src/renderer//r_ms_earlyz.cpp \
 	@echo Compiling ../../src/renderer//r_ms_earlyz.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_ms_earlyz.cpp -o r_ms_earlyz.o
 
-renderer.o: ../../src/renderer//renderer.cpp \
- ../../src/renderer//renderer.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/math/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
- ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
- ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/resources/texture.h \
- ../../src/scene/scene.h ../../src/uncategorized/skybox.h \
- ../../src/renderer//r_private.h
-	@echo Compiling ../../src/renderer//renderer.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//renderer.cpp -o renderer.o
-
-r_pps_ssao.o: ../../src/renderer//r_pps_ssao.cpp \
- ../../src/renderer//renderer.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/math/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
- ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+r_pps.o: ../../src/renderer//r_pps.cpp ../../src/renderer//renderer.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
  ../../src/math/vec4.inl.h ../../src/math/quat.h \
  ../../src/math/quat.inl.h ../../src/math/axisang.h \
  ../../src/math/axisang.inl.h ../../src/math/euler.h \
@@ -337,13 +268,12 @@ r_pps_ssao.o: ../../src/renderer//r_pps_ssao.cpp \
  ../../src/utility/util.h ../../src/utility/common.h \
  ../../src/scene/camera.h ../../src/uncategorized/collision.h \
  ../../src/scene/node.h ../../src/resources/resource.h \
- ../../src/resources/texture.h ../../src/scene/scene.h \
- ../../src/uncategorized/skybox.h ../../src/renderer//r_private.h \
+ ../../src/resources/texture.h ../../src/renderer//r_private.h \
  ../../src/renderer//fbo.h
-	@echo Compiling ../../src/renderer//r_pps_ssao.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_ssao.cpp -o r_pps_ssao.o
+	@echo Compiling ../../src/renderer//r_pps.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps.cpp -o r_pps.o
 
-r_is.o: ../../src/renderer//r_is.cpp ../../src/renderer//renderer.h \
+r_bs.o: ../../src/renderer//r_bs.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
  ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
@@ -362,11 +292,11 @@ r_is.o: ../../src/renderer//r_is.cpp ../../src/renderer//renderer.h \
  ../../src/scene/node.h ../../src/scene/scene.h \
  ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
  ../../src/resources/mesh.h ../../src/renderer/vbo.h \
- ../../src/scene/light.h ../../src/scene/camera.h \
- ../../src/resources/resource.h ../../src/renderer//r_private.h \
- ../../src/renderer//fbo.h ../../src/resources/light_props.h
-	@echo Compiling ../../src/renderer//r_is.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_is.cpp -o r_is.o
+ ../../src/renderer//r_private.h ../../src/resources/resource.h \
+ ../../src/renderer//fbo.h ../../src/scene/mesh_node.h \
+ ../../src/resources/material.h
+	@echo Compiling ../../src/renderer//r_bs.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_bs.cpp -o r_bs.o
 
 r_dbg.o: ../../src/renderer//r_dbg.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
@@ -392,6 +322,30 @@ r_dbg.o: ../../src/renderer//r_dbg.cpp ../../src/renderer//renderer.h \
 	@echo Compiling ../../src/renderer//r_dbg.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_dbg.cpp -o r_dbg.o
 
+r_ms.o: ../../src/renderer//r_ms.cpp ../../src/renderer//renderer.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/scene/camera.h ../../src/uncategorized/collision.h \
+ ../../src/scene/node.h ../../src/scene/scene.h \
+ ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
+ ../../src/resources/mesh.h ../../src/renderer/vbo.h \
+ ../../src/renderer//r_private.h ../../src/renderer//fbo.h \
+ ../../src/resources/material.h ../../src/scene/mesh_node.h
+	@echo Compiling ../../src/renderer//r_ms.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_ms.cpp -o r_ms.o
+
 r_pps_lscatt.o: ../../src/renderer//r_pps_lscatt.cpp \
  ../../src/renderer//renderer.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/math/gmath.h \
@@ -415,6 +369,29 @@ r_pps_lscatt.o: ../../src/renderer//r_pps_lscatt.cpp \
 	@echo Compiling ../../src/renderer//r_pps_lscatt.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_lscatt.cpp -o r_pps_lscatt.o
 
+r_pps_hdr.o: ../../src/renderer//r_pps_hdr.cpp \
+ ../../src/renderer//renderer.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
+ ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/scene/camera.h ../../src/uncategorized/collision.h \
+ ../../src/scene/node.h ../../src/resources/resource.h \
+ ../../src/resources/texture.h ../../src/scene/scene.h \
+ ../../src/uncategorized/skybox.h ../../src/renderer//r_private.h \
+ ../../src/renderer//fbo.h
+	@echo Compiling ../../src/renderer//r_pps_hdr.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_hdr.cpp -o r_pps_hdr.o
+
 r_bs2.o: ../../src/renderer//r_bs2.cpp ../../src/renderer//renderer.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
@@ -440,31 +417,28 @@ r_bs2.o: ../../src/renderer//r_bs2.cpp ../../src/renderer//renderer.h \
 	@echo Compiling ../../src/renderer//r_bs2.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_bs2.cpp -o r_bs2.o
 
-mesh_node.o: ../../src/scene//mesh_node.cpp ../../src/scene//mesh_node.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/scene//node.h ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+r_pps_ssao.o: ../../src/renderer//r_pps_ssao.cpp \
+ ../../src/renderer//renderer.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
+ ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
  ../../src/math/vec4.inl.h ../../src/math/quat.h \
  ../../src/math/quat.inl.h ../../src/math/axisang.h \
  ../../src/math/axisang.inl.h ../../src/math/euler.h \
  ../../src/math/euler.inl.h ../../src/math/mat3.h \
  ../../src/math/mat3.inl.h ../../src/math/mat4.h \
  ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/material.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
  ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/resources/resource.h ../../src/resources/mesh.h \
- ../../src/renderer/vbo.h ../../src/uncategorized/collision.h \
- ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
- ../../src/scene/camera.h ../../src/scene/node.h \
- ../../src/scene//skel_node.h ../../src/controllers/controller.h \
- ../../src/resources/skeleton.h ../../src/controllers/mesh_skel_ctrl.h \
- ../../src/controllers/controller.h \
- ../../src/controllers/skel_anim_ctrl.h
-	@echo Compiling ../../src/scene//mesh_node.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//mesh_node.cpp -o mesh_node.o
+ ../../src/scene/camera.h ../../src/uncategorized/collision.h \
+ ../../src/scene/node.h ../../src/resources/resource.h \
+ ../../src/resources/texture.h ../../src/scene/scene.h \
+ ../../src/uncategorized/skybox.h ../../src/renderer//r_private.h \
+ ../../src/renderer//fbo.h
+	@echo Compiling ../../src/renderer//r_pps_ssao.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/renderer//r_pps_ssao.cpp -o r_pps_ssao.o
 
 skel_node.o: ../../src/scene//skel_node.cpp ../../src/scene//skel_node.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
@@ -489,28 +463,6 @@ skel_node.o: ../../src/scene//skel_node.cpp ../../src/scene//skel_node.h \
 	@echo Compiling ../../src/scene//skel_node.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//skel_node.cpp -o skel_node.o
 
-light.o: ../../src/scene//light.cpp ../../src/scene//light.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/resources/texture.h ../../src/resources/resource.h \
- ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h ../../src/scene//node.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/scene//camera.h \
- ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
- ../../src/resources/shader_prog.h ../../src/scene/camera.h \
- ../../src/resources/light_props.h
-	@echo Compiling ../../src/scene//light.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//light.cpp -o light.o
-
 skel_model_node.o: ../../src/scene//skel_model_node.cpp \
  ../../src/scene//skel_model_node.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/scene//mesh_node.h \
@@ -534,6 +486,26 @@ skel_model_node.o: ../../src/scene//skel_model_node.cpp \
 	@echo Compiling ../../src/scene//skel_model_node.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//skel_model_node.cpp -o skel_model_node.o
 
+camera.o: ../../src/scene//camera.cpp ../../src/scene//camera.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/uncategorized/collision.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
+ ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/scene//node.h \
+ ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
+ ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/scene/camera.h
+	@echo Compiling ../../src/scene//camera.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//camera.cpp -o camera.o
+
 node.o: ../../src/scene//node.cpp ../../src/scene//node.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
@@ -555,25 +527,53 @@ node.o: ../../src/scene//node.cpp ../../src/scene//node.h \
 	@echo Compiling ../../src/scene//node.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//node.cpp -o node.o
 
-camera.o: ../../src/scene//camera.cpp ../../src/scene//camera.h \
+mesh_node.o: ../../src/scene//mesh_node.cpp ../../src/scene//mesh_node.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/uncategorized/collision.h ../../src/math/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
- ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/scene//node.h ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
  ../../src/math/vec4.inl.h ../../src/math/quat.h \
  ../../src/math/quat.inl.h ../../src/math/axisang.h \
  ../../src/math/axisang.inl.h ../../src/math/euler.h \
  ../../src/math/euler.inl.h ../../src/math/mat3.h \
  ../../src/math/mat3.inl.h ../../src/math/mat4.h \
  ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/scene//node.h \
- ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/material.h \
  ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
  ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/scene/camera.h
-	@echo Compiling ../../src/scene//camera.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//camera.cpp -o camera.o
+ ../../src/resources/resource.h ../../src/resources/mesh.h \
+ ../../src/renderer/vbo.h ../../src/uncategorized/collision.h \
+ ../../src/renderer/renderer.h ../../src/resources/shader_prog.h \
+ ../../src/scene/camera.h ../../src/scene/node.h \
+ ../../src/scene//skel_node.h ../../src/controllers/controller.h \
+ ../../src/resources/skeleton.h ../../src/controllers/mesh_skel_ctrl.h \
+ ../../src/controllers/controller.h \
+ ../../src/controllers/skel_anim_ctrl.h
+	@echo Compiling ../../src/scene//mesh_node.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//mesh_node.cpp -o mesh_node.o
+
+light.o: ../../src/scene//light.cpp ../../src/scene//light.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
+ ../../src/resources/texture.h ../../src/resources/resource.h \
+ ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
+ ../../src/utility/common.h ../../src/scene//node.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/scene//camera.h \
+ ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
+ ../../src/resources/shader_prog.h ../../src/scene/camera.h \
+ ../../src/resources/light_props.h
+	@echo Compiling ../../src/scene//light.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/scene//light.cpp -o light.o
 
 scene.o: ../../src/scene//scene.cpp ../../src/scene//scene.h \
  ../../src/utility/common.h ../../src/uncategorized/memory.h \
@@ -619,6 +619,36 @@ ui.o: ../../src/ui//ui.cpp ../../src/ui//ui.h ../../src/utility/common.h \
 	@echo Compiling ../../src/ui//ui.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/ui//ui.cpp -o ui.o
 
+extension.o: ../../src/resources//extension.cpp \
+ ../../src/resources//extension.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/resources//resource.h \
+ ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
+ ../../src/utility/common.h
+	@echo Compiling ../../src/resources//extension.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//extension.cpp -o extension.o
+
+shader_prog.o: ../../src/resources//shader_prog.cpp \
+ ../../src/resources//shader_prog.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/resources//resource.h \
+ ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
+ ../../src/utility/common.h ../../src/renderer/renderer.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/scene/camera.h ../../src/uncategorized/collision.h \
+ ../../src/scene/node.h ../../src/resources//shader_parser.h \
+ ../../src/resources//texture.h
+	@echo Compiling ../../src/resources//shader_prog.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_prog.cpp -o shader_prog.o
+
 material.o: ../../src/resources//material.cpp \
  ../../src/resources//material.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/math/gmath.h \
@@ -642,11 +672,8 @@ material.o: ../../src/resources//material.cpp \
 	@echo Compiling ../../src/resources//material.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//material.cpp -o material.o
 
-texture.o: ../../src/resources//texture.cpp \
- ../../src/resources//texture.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/resources//resource.h \
- ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h ../../src/renderer/renderer.h \
+mesh.o: ../../src/resources//mesh.cpp ../../src/resources//mesh.h \
+ ../../src/utility/common.h ../../src/uncategorized/memory.h \
  ../../src/math/gmath.h ../../src/math/vec2.h \
  ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
  ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
@@ -657,11 +684,16 @@ texture.o: ../../src/resources//texture.cpp \
  ../../src/math/euler.inl.h ../../src/math/mat3.h \
  ../../src/math/mat3.inl.h ../../src/math/mat4.h \
  ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
- ../../src/resources/resource.h ../../src/scene/camera.h \
- ../../src/uncategorized/collision.h ../../src/scene/node.h
-	@echo Compiling ../../src/resources//texture.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//texture.cpp -o texture.o
+ ../../src/math/m_misc.inl.h ../../src/renderer/vbo.h \
+ ../../src/resources//resource.h ../../src/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
+ ../../src/resources/shader_prog.h ../../src/resources/resource.h \
+ ../../src/scene/camera.h ../../src/scene/node.h \
+ ../../src/tokenizer/scanner.h ../../src/tokenizer/parser.h \
+ ../../src/tokenizer/scanner.h
+	@echo Compiling ../../src/resources//mesh.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//mesh.cpp -o mesh.o
 
 skel_anim.o: ../../src/resources//skel_anim.cpp \
  ../../src/resources//skel_anim.h ../../src/utility/common.h \
@@ -682,40 +714,26 @@ skel_anim.o: ../../src/resources//skel_anim.cpp \
 	@echo Compiling ../../src/resources//skel_anim.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//skel_anim.cpp -o skel_anim.o
 
-extension.o: ../../src/resources//extension.cpp \
- ../../src/resources//extension.h ../../src/utility/common.h \
+texture.o: ../../src/resources//texture.cpp \
+ ../../src/resources//texture.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/resources//resource.h \
  ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h
-	@echo Compiling ../../src/resources//extension.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//extension.cpp -o extension.o
-
-shader_parser.o: ../../src/resources//shader_parser.cpp \
- ../../src/resources//shader_parser.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/tokenizer/scanner.h \
- ../../src/tokenizer/parser.h ../../src/tokenizer/scanner.h \
- ../../src/utility/util.h ../../src/utility/common.h
-	@echo Compiling ../../src/resources//shader_parser.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_parser.cpp -o shader_parser.o
-
-skeleton.o: ../../src/resources//skeleton.cpp \
- ../../src/resources//skeleton.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/math/gmath.h \
- ../../src/math/vec2.h ../../src/math/forward_decls.h \
- ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
- ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/utility/common.h ../../src/renderer/renderer.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
  ../../src/math/vec4.inl.h ../../src/math/quat.h \
  ../../src/math/quat.inl.h ../../src/math/axisang.h \
  ../../src/math/axisang.inl.h ../../src/math/euler.h \
  ../../src/math/euler.inl.h ../../src/math/mat3.h \
  ../../src/math/mat3.inl.h ../../src/math/mat4.h \
  ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources//resource.h \
- ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h ../../src/tokenizer/scanner.h \
- ../../src/tokenizer/parser.h ../../src/tokenizer/scanner.h
-	@echo Compiling ../../src/resources//skeleton.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//skeleton.cpp -o skeleton.o
+ ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
+ ../../src/resources/resource.h ../../src/scene/camera.h \
+ ../../src/uncategorized/collision.h ../../src/scene/node.h
+	@echo Compiling ../../src/resources//texture.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//texture.cpp -o texture.o
 
 resource.o: ../../src/resources//resource.cpp \
  ../../src/resources//resource.h ../../src/utility/common.h \
@@ -739,6 +757,25 @@ resource.o: ../../src/resources//resource.cpp \
 	@echo Compiling ../../src/resources//resource.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//resource.cpp -o resource.o
 
+skeleton.o: ../../src/resources//skeleton.cpp \
+ ../../src/resources//skeleton.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/math/gmath.h \
+ ../../src/math/vec2.h ../../src/math/forward_decls.h \
+ ../../src/math/vec2.inl.h ../../src/math/m_dflt_header.h \
+ ../../src/math/vec3.h ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h ../../src/resources//resource.h \
+ ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
+ ../../src/utility/common.h ../../src/tokenizer/scanner.h \
+ ../../src/tokenizer/parser.h ../../src/tokenizer/scanner.h
+	@echo Compiling ../../src/resources//skeleton.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//skeleton.cpp -o skeleton.o
+
 light_props.o: ../../src/resources//light_props.cpp \
  ../../src/resources//light_props.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/resources//resource.h \
@@ -758,50 +795,13 @@ light_props.o: ../../src/resources//light_props.cpp \
 	@echo Compiling ../../src/resources//light_props.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//light_props.cpp -o light_props.o
 
-mesh.o: ../../src/resources//mesh.cpp ../../src/resources//mesh.h \
- ../../src/utility/common.h ../../src/uncategorized/memory.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/renderer/vbo.h \
- ../../src/resources//resource.h ../../src/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/uncategorized/collision.h ../../src/renderer/renderer.h \
- ../../src/resources/shader_prog.h ../../src/resources/resource.h \
- ../../src/scene/camera.h ../../src/scene/node.h \
- ../../src/tokenizer/scanner.h ../../src/tokenizer/parser.h \
- ../../src/tokenizer/scanner.h
-	@echo Compiling ../../src/resources//mesh.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//mesh.cpp -o mesh.o
-
-shader_prog.o: ../../src/resources//shader_prog.cpp \
- ../../src/resources//shader_prog.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/resources//resource.h \
- ../../src/uncategorized/engine_class.h ../../src/utility/util.h \
- ../../src/utility/common.h ../../src/renderer/renderer.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h ../../src/resources/shader_prog.h \
- ../../src/scene/camera.h ../../src/uncategorized/collision.h \
- ../../src/scene/node.h ../../src/resources//shader_parser.h \
- ../../src/resources//texture.h
-	@echo Compiling ../../src/resources//shader_prog.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_prog.cpp -o shader_prog.o
+shader_parser.o: ../../src/resources//shader_parser.cpp \
+ ../../src/resources//shader_parser.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/tokenizer/scanner.h \
+ ../../src/tokenizer/parser.h ../../src/tokenizer/scanner.h \
+ ../../src/utility/util.h ../../src/utility/common.h
+	@echo Compiling ../../src/resources//shader_parser.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/resources//shader_parser.cpp -o shader_parser.o
 
 app.o: ../../src/utility//app.cpp ../../src/utility//app.h \
  ../../src/utility//common.h ../../src/uncategorized/memory.h \
@@ -820,26 +820,6 @@ util.o: ../../src/utility//util.cpp ../../src/utility//util.h \
 	@echo Compiling ../../src/utility//util.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/utility//util.cpp -o util.o
 
-controller.o: ../../src/controllers//controller.cpp \
- ../../src/controllers//controller.h ../../src/utility/common.h \
- ../../src/uncategorized/memory.h ../../src/scene/scene.h \
- ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
- ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
- ../../src/utility/util.h ../../src/utility/common.h \
- ../../src/math/gmath.h ../../src/math/vec2.h \
- ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
- ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
- ../../src/math/vec3.inl.h ../../src/math/vec4.h \
- ../../src/math/vec4.inl.h ../../src/math/quat.h \
- ../../src/math/quat.inl.h ../../src/math/axisang.h \
- ../../src/math/axisang.inl.h ../../src/math/euler.h \
- ../../src/math/euler.inl.h ../../src/math/mat3.h \
- ../../src/math/mat3.inl.h ../../src/math/mat4.h \
- ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
- ../../src/math/m_misc.inl.h
-	@echo Compiling ../../src/controllers//controller.cpp...
-	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//controller.cpp -o controller.o
-
 skel_anim_ctrl.o: ../../src/controllers//skel_anim_ctrl.cpp \
  ../../src/controllers//skel_anim_ctrl.h ../../src/utility/common.h \
  ../../src/uncategorized/memory.h ../../src/controllers//controller.h \
@@ -863,6 +843,26 @@ skel_anim_ctrl.o: ../../src/controllers//skel_anim_ctrl.cpp \
 	@echo Compiling ../../src/controllers//skel_anim_ctrl.cpp...
 	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//skel_anim_ctrl.cpp -o skel_anim_ctrl.o
 
+controller.o: ../../src/controllers//controller.cpp \
+ ../../src/controllers//controller.h ../../src/utility/common.h \
+ ../../src/uncategorized/memory.h ../../src/scene/scene.h \
+ ../../src/uncategorized/skybox.h ../../src/resources/texture.h \
+ ../../src/resources/resource.h ../../src/uncategorized/engine_class.h \
+ ../../src/utility/util.h ../../src/utility/common.h \
+ ../../src/math/gmath.h ../../src/math/vec2.h \
+ ../../src/math/forward_decls.h ../../src/math/vec2.inl.h \
+ ../../src/math/m_dflt_header.h ../../src/math/vec3.h \
+ ../../src/math/vec3.inl.h ../../src/math/vec4.h \
+ ../../src/math/vec4.inl.h ../../src/math/quat.h \
+ ../../src/math/quat.inl.h ../../src/math/axisang.h \
+ ../../src/math/axisang.inl.h ../../src/math/euler.h \
+ ../../src/math/euler.inl.h ../../src/math/mat3.h \
+ ../../src/math/mat3.inl.h ../../src/math/mat4.h \
+ ../../src/math/mat4.inl.h ../../src/math/m_misc.h \
+ ../../src/math/m_misc.inl.h
+	@echo Compiling ../../src/controllers//controller.cpp...
+	@$(CXX) $(INCPATH) $(CFLAGS) ../../src/controllers//controller.cpp -o controller.o
+
 clean:
 	rm -f *.o
 	rm -f *.gch

+ 10 - 3
build/debug/gen.cfg.py

@@ -1,8 +1,15 @@
-include_paths = [ "../../src/math/", "../../src/tokenizer/", "../../src/uncategorized/", "../../src/", "../../src/renderer/", "../../src/scene/", "../../src/ui/", "../../src/resources/", "../../src/utility/", "../../src/controllers/" ]
+source_paths = [ "../../src/math/", "../../src/tokenizer/", "../../src/uncategorized/", "../../src/", "../../src/renderer/", "../../src/scene/", "../../src/ui/", "../../src/resources/", "../../src/utility/", "../../src/controllers/" ]
+
+include_paths = list(source_paths)
+#include_paths.extend( ["../../../bullet_svn/src/BulletDynamics", "../../../bullet_svn/src/BulletDynamics/ibmsdk", "../../../bullet_svn/src/BulletDynamics/Character", "../../../bullet_svn/src/BulletDynamics/Vehicle", "../../../bullet_svn/src/BulletDynamics/Dynamics", "../../../bullet_svn/src/BulletDynamics/ConstraintSolver", "../../../bullet_svn/src/ibmsdk", "../../../bullet_svn/src/BulletCollision", "../../../bullet_svn/src/BulletCollision/ibmsdk", "../../../bullet_svn/src/BulletCollision/NarrowPhaseCollision", "../../../bullet_svn/src/BulletCollision/Gimpact", "../../../bullet_svn/src/BulletCollision/BroadphaseCollision", "../../../bullet_svn/src/BulletCollision/CollisionShapes", "../../../bullet_svn/src/BulletCollision/CollisionDispatch", "../../../bullet_svn/src/BulletMultiThreaded", "../../../bullet_svn/src/BulletMultiThreaded/SpuSampleTask", "../../../bullet_svn/src/BulletMultiThreaded/MiniCLTask", "../../../bullet_svn/src/BulletMultiThreaded/out", "../../../bullet_svn/src/BulletMultiThreaded/vectormath", "../../../bullet_svn/src/BulletMultiThreaded/vectormath/scalar", "../../../bullet_svn/src/BulletMultiThreaded/vectormath/scalar/cpp", "../../../bullet_svn/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask", "../../../bullet_svn/src/LinearMath", "../../../bullet_svn/src/LinearMath/ibmsdk", "../../../bullet_svn/src/BulletSoftBody", "../../../bullet_svn/src/MiniCL"] )
+include_paths.extend( [ "../../../bullet_svn/src/" ] )
+
 precompiled_headers = []
 executable_name = "AnKi.bin"
 compiler = "g++"
 common_flags = ""
-compiler_flags = "-c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -pipe -O0 -g3 -pg `sdl-config --cflags` -D_DEBUG_ -D_TERMINAL_COLORING_ -D_PLATFORM_LINUX_"
+compiler_flags = "-c -pedantic-errors -pedantic -ansi -Wall -Wextra -W -pipe -O0 -g3 -pg `sdl-config --cflags` -D_DEBUG_ -D_TERMINAL_COLORING__ -D_PLATFORM_LINUX_"
 precompiled_headers_flags = "-x c++-header"
-linker_flags = "-lGL -lGLU -lSDL_image `sdl-config --static-libs` -ljpeg -lGLEW -rdynamic"
+#linker_flags = "-L../../../bullet_svn/src/BulletSoftBody -L../../../bullet_svn/src/BulletDynamics -L../../../bullet_svn/src/BulletCollision -L../../../bullet_svn/src/LinearMath -L/usr/lib -L/usr/local/lib -Wl,-rpath,/usr/local/lib,-Bstatic -lSDL -lSDL_image -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -Wl,-Bdynamic -lGL -lGLU -ljpeg -lGLEW"
+linker_flags = "-L/usr/lib -L/usr/local/lib -Wl,-rpath,/usr/local/lib,-Bstatic -lSDL -lSDL_image -Wl,-Bdynamic -lGL -lGLU -ljpeg -lGLEW"
+#linker_flags = "-rdynamic -static-libgcc -static-stdc++ -Bdynamic -lGL -lGLU -ljpeg -lGLEW -Bstatic `sdl-config --static-libs` -lSDL_image"

+ 4 - 4
build/genmakefile.py

@@ -6,7 +6,7 @@ from threading import Thread
 #======================================================================================================================================
 # GLOBAL VARS                                                                                                                         =
 #======================================================================================================================================
-include_paths = []
+source_paths = []
 precompiled_headers = []
 executable_name = "unamed_project"
 compiler = ""
@@ -44,7 +44,7 @@ class target_thread_t( Thread ):
 	def run( self ):
 		for i in self.range:
 			source_file = source_files[i]
-			self.out_str += GetCommandOutput( compiler + " -MM " + compiler_flags + " " + source_file.cpp_file + " -MT" + source_file.obj_file )
+			self.out_str += GetCommandOutput( compiler + " -MM " + compiler_flags + " " + source_file.cpp_file + " -MT " + source_file.obj_file )
 			self.out_str += "\t@echo Compiling " + source_file.cpp_file + "...\n"
 			self.out_str += "\t@$(CXX) $(INCPATH) $(CFLAGS) " + source_file.cpp_file + " -o " + \
 			                source_file.obj_file + "\n\n"
@@ -116,7 +116,7 @@ exec( compile( source, input_cfgfile, "exec" ) )
 
 # find the cpp files
 source_files = []
-for source_dir in include_paths:
+for source_dir in source_paths:
 	files = os.listdir( source_dir )
 	for file_ in fnmatch.filter( files, "*.cpp" ):
 		sfile = source_file_t()
@@ -176,7 +176,7 @@ master_str += "all: $(PRECOMPILED_HEADERS) $(SOURCES) $(EXECUTABLE)\n\n"
 
 master_str += "$(EXECUTABLE): $(OBJECTS)\n"
 master_str += "\t@echo Linking...\n"
-master_str += "\t@$(CXX) $(LFLAGS) $(OBJECTS) -o $(EXECUTABLE)\n"
+master_str += "\t$(CXX) $(OBJECTS) $(LFLAGS) -o $(EXECUTABLE)\n"
 master_str += "\t@echo All Done!\n\n"
 
 

+ 2 - 0
shaders/ms_mp.glsl

@@ -0,0 +1,2 @@
+
+#pragma anki include "shaders/ms_mp_generic.glsl"

+ 30 - 2
src/main.cpp

@@ -29,6 +29,8 @@
 #include "skel_anim_ctrl.h"
 #include "skel_node.h"
 #include "light_props.h"
+//#include "btBulletCollisionCommon.h"
+//#include "btBulletDynamicsCommon.h"
 
 
 // map (hard coded)
@@ -38,6 +40,31 @@ skel_model_node_t* imp;
 point_light_t* point_lights[10];
 spot_light_t* spot_lights[2];
 
+class floor_t: public camera_t
+{
+	public:
+		void Render()
+		{
+			r::dbg::RenderCube( true, 1.0 );
+		}
+
+		void RenderDepth()
+		{
+			r::dbg::RenderCube( true, 1.0 );
+		}
+}* floor_;
+
+
+// Physics
+//btDefaultCollisionConfiguration* collisionConfiguration;
+
+
+
+void initPhysics()
+{
+	//collisionConfiguration = new btDefaultCollisionConfiguration();
+}
+
 
 //=====================================================================================================================================
 // Init                                                                                                                               =
@@ -100,8 +127,9 @@ void Init()
 	imp->mesh_nodes[0]->mesh_skel_ctrl->skel_node->skel_anim_ctrl->step = 0.8;
 
 
-
-
+	//
+	floor_ = new floor_t;
+	//floor_->material = rsrc::materials.Load( "materials/default.mtl" );
 
 	const char* skybox_fnames [] = { "textures/env/hellsky4_forward.tga", "textures/env/hellsky4_back.tga", "textures/env/hellsky4_left.tga",
 																	 "textures/env/hellsky4_right.tga", "textures/env/hellsky4_up.tga", "textures/env/hellsky4_down.tga" };

+ 4 - 1
src/renderer/r_is.cpp

@@ -138,7 +138,10 @@ static void InitStageFBO()
 	fbo.SetNumOfColorAttachements(1);
 
 	// create the txtrs
-	fai.CreateEmpty2D( r::w, r::h, GL_RGB, GL_RGB );
+	if( !fai.CreateEmpty2D( r::w, r::h, GL_RGB, GL_RGB, GL_UNSIGNED_BYTE ) )
+	{
+		FATAL( "See prev error" );
+	}
 
 	// attach
 	glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, fai.GetGLID(), 0 );

+ 5 - 3
src/renderer/r_is_shadows.cpp

@@ -24,7 +24,7 @@ static fbo_t fbo;
 shader_prog_t* shdr_depth, * shdr_depth_grass, * shdr_depth_hw_skinning;
 
 // exportable vars
-int shadow_resolution = 256;
+int shadow_resolution = 512;
 texture_t shadow_map;
 
 
@@ -109,8 +109,10 @@ void RunPass( const camera_t& cam )
 
 		DEBUG_ERR( mesh_node->material->dp_mtl == NULL );
 
-		mesh_node->material->dp_mtl->Setup();
-		mesh_node->RenderDepth();
+		//mesh_node->material->dp_mtl->Setup();
+		//mesh_node->RenderDepth();
+		mesh_node->material->Setup();
+		mesh_node->Render();
 	}
 
 	glDisable( GL_POLYGON_OFFSET_FILL );

+ 1 - 0
src/renderer/r_ms.cpp

@@ -103,6 +103,7 @@ void RunStage( const camera_t& cam )
 	for( uint i=0; i<scene::mesh_nodes.size(); i++ )
 	{
 		mesh_node_t* mesh_node = scene::mesh_nodes[i];
+		DEBUG_ERR( mesh_node->material == NULL );
 		if( mesh_node->material->blends || mesh_node->material->refracts ) continue;
 		mesh_node->material->Setup();
 		mesh_node->Render();

+ 1 - 1
src/renderer/r_pps_lscatt.cpp

@@ -18,7 +18,7 @@ VARS
 static fbo_t fbo; // yet another FBO
 
 float rendering_quality = 1.0;
-bool enabled = true;
+bool enabled = false;
 
 texture_t fai;
 

+ 1 - 0
src/resources/resource.h

@@ -132,6 +132,7 @@ template<typename type_t> class container_t: public vec_t<type_t*>
 		/**
 		 * Load an object and register it. If its allready loaded return its pointer
 		 * @param fname The filename that initializes the object
+		 * @return A pointer of a new resource or NULL on fail
 		 */
 		type_t* Load( const char* fname )
 		{

+ 7 - 2
src/resources/texture.cpp

@@ -349,7 +349,7 @@ bool texture_t::Load( const char* filename )
 //=====================================================================================================================================
 // CreateEmpty2D                                                                                                                      =
 //=====================================================================================================================================
-void texture_t::CreateEmpty2D( float width_, float height_, int internal_format, int format_, GLenum type_ )
+bool texture_t::CreateEmpty2D( float width_, float height_, int internal_format, int format_, GLenum type_ )
 {
 	type = GL_TEXTURE_2D;
 	DEBUG_ERR( internal_format>0 && internal_format<=4 ); // deprecated internal format
@@ -370,14 +370,18 @@ void texture_t::CreateEmpty2D( float width_, float height_, int internal_format,
 
 	GLenum errid = glGetError();
 	if( errid != GL_NO_ERROR )
+	{
 		ERROR( "OpenGL Error: " << gluErrorString( errid ) );
+		return false;
+	}
+	return true;
 }
 
 
 //=====================================================================================================================================
 // CreateEmpty2DMSAA                                                                                                                  =
 //=====================================================================================================================================
-void texture_t::CreateEmpty2DMSAA( float width, float height, int samples_num, int internal_format )
+bool texture_t::CreateEmpty2DMSAA( float width, float height, int samples_num, int internal_format )
 {
 	/*type = GL_TEXTURE_2D_MULTISAMPLE;
 	DEBUG_ERR( internal_format>0 && internal_format<=4 ); // deprecated internal format
@@ -388,6 +392,7 @@ void texture_t::CreateEmpty2DMSAA( float width, float height, int samples_num, i
 	
 	// allocate
 	glTexImage2DMultisample( type, samples_num, internal_format, width, height, false );*/
+	return true;
 }
 
 

+ 2 - 2
src/resources/texture.h

@@ -56,8 +56,8 @@ class texture_t: public resource_t
 
 		bool Load( const char* filename );
 		void Unload();
-		void CreateEmpty2D( float width, float height, int internal_format, int format, GLenum type_ = GL_FLOAT );
-		void CreateEmpty2DMSAA( float width, float height, int samples_num, int internal_format );
+		bool CreateEmpty2D( float width, float height, int internal_format, int format, GLenum type_ = GL_FLOAT );
+		bool CreateEmpty2DMSAA( float width, float height, int samples_num, int internal_format );
 
 		void Bind( uint unit=0 ) const;
 

+ 2 - 2
src/scene/mesh_node.h

@@ -24,8 +24,8 @@ class mesh_node_t: public node_t
 		mesh_skel_ctrl_t* mesh_skel_ctrl;
 		// funcs
 		mesh_node_t(): node_t(NT_MESH), mesh_skel_ctrl(NULL) {}
-		void Render() { Render(material); }
-		void RenderDepth() { Render( material->dp_mtl ); }
+		virtual void Render() { Render(material); }
+		virtual void RenderDepth() { Render( material->dp_mtl ); }
 		void Init( const char* filename );
 		void Deinit();
 };