Skip to content

Commit ddf4f21

Browse files
flipcoderflipcoder
committed
lots of changes, finished multi-pass rendering, new physics stubbed for now
1 parent 7767902 commit ddf4f21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+9678
-9726
lines changed

‎bin/data/base/shaders/bump.fp

+5-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ void main(void)
3030
float height = texture2D(disp, vUV).r * 0.04 - 0.02;
3131
vec2 uvp = vUV + (eye.xy * height);
3232

33-
vec4 texel = texture2D(tex, uvp);
33+
vec4 texel = texture2D(tex, uvp);
34+
/*vec4 texel = vec4(0.0f, 0.0f, 0.0f, 1.0f);*/ // this line + white light for pencil sketch shader
3435
if(texel.a < 0.5)
3536
discard;
36-
vec3 bump = normalize(texture2D(nmap, uvp).rgb * 2.0 - 1.0);
37+
vec3 bump = normalize(texture2D(nmap, uvp).rgb * 2.0 - 1.0);
38+
/*vec3 bump = normalize(vec3(1.0, 1.0, 1.0) * 2.0 - 1.0);*/
3739
/*float occ = texture2D(occ, uvp).r;*/
3840

3941
/*float ambient = 0.1;*/
@@ -44,7 +46,7 @@ void main(void)
4446
if(shine > EPSILON)
4547
{
4648
shine = 1.0 / shine;
47-
specular = pow(clamp(dot(reflect(-eye, bump), light), 0.0, 1.0), shine) * 0.1; // 1.0
49+
specular = pow(clamp(dot(reflect(-eye, bump), light), 0.0, 1.0), shine) * 1.0; // 1.0
4850
}
4951
else
5052
specular = 0.0f;

‎premake4.lua

+7-6
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ solution("qor")
1818
"ILU",
1919
"openal",
2020
"alut",
21-
--"Newton",
22-
"BulletSoftBody",
23-
"BulletDynamics",
24-
"BulletCollision",
21+
"Newton",
22+
"dJointLibrary",
23+
--"BulletSoftBody",
24+
--"BulletDynamics",
25+
--"BulletCollision",
2526
"LinearMath",
2627
"ogg",
2728
"vorbis",
@@ -42,8 +43,8 @@ solution("qor")
4243

4344
configuration { "linux" }
4445
includedirs {
45-
"/usr/include/freetype2/",
46-
"/usr/include/bullet/"
46+
"/usr/include/freetype2",
47+
"/usr/include/newton"
4748
}
4849
configuration {}
4950

‎qor.make

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ ifeq ($(config),debug)
2424
TARGETDIR = bin
2525
TARGET = $(TARGETDIR)/qor
2626
DEFINES += -DDEBUG
27-
INCLUDES += -I/usr/include/freetype2 -I/usr/include/bullet -Ithird_party/include
27+
INCLUDES += -I/usr/include/freetype2 -I/usr/include/newton -Ithird_party/include
2828
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
2929
CFLAGS += $(CPPFLAGS) $(ARCH) -g -std=c++0x
3030
CXXFLAGS += $(CFLAGS)
3131
LDFLAGS += -Lthird_party/lib
32-
LIBS += -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -llua5.1 -lluabind
32+
LIBS += -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lNewton -ldJointLibrary -lLinearMath -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -llua5.1 -lluabind
3333
RESFLAGS += $(DEFINES) $(INCLUDES)
3434
LDDEPS +=
3535
LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
@@ -46,12 +46,12 @@ ifeq ($(config),release)
4646
TARGETDIR = bin
4747
TARGET = $(TARGETDIR)/qor
4848
DEFINES += -DNDEBUG
49-
INCLUDES += -I/usr/include/freetype2 -I/usr/include/bullet -Ithird_party/include
49+
INCLUDES += -I/usr/include/freetype2 -I/usr/include/newton -Ithird_party/include
5050
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
5151
CFLAGS += $(CPPFLAGS) $(ARCH) -O2 -std=c++0x
5252
CXXFLAGS += $(CFLAGS)
5353
LDFLAGS += -s -Lthird_party/lib
54-
LIBS += -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -llua5.1 -lluabind
54+
LIBS += -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lNewton -ldJointLibrary -lLinearMath -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -llua5.1 -lluabind
5555
RESFLAGS += $(DEFINES) $(INCLUDES)
5656
LDDEPS +=
5757
LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
@@ -71,10 +71,10 @@ OBJECTS := \
7171
$(OBJDIR)/EnvironmentNode.o \
7272
$(OBJDIR)/Console.o \
7373
$(OBJDIR)/Mesh.o \
74-
$(OBJDIR)/DumbyPartitioner.o \
7574
$(OBJDIR)/Material.o \
7675
$(OBJDIR)/Main.o \
7776
$(OBJDIR)/Engine.o \
77+
$(OBJDIR)/DummyPartitioner.o \
7878
$(OBJDIR)/TrackerNode.o \
7979
$(OBJDIR)/Entity.o \
8080
$(OBJDIR)/Renderer.o \
@@ -88,6 +88,7 @@ OBJECTS := \
8888
$(OBJDIR)/Settings.o \
8989
$(OBJDIR)/Developer.o \
9090
$(OBJDIR)/Graphics.o \
91+
$(OBJDIR)/Light.o \
9192
$(OBJDIR)/Log.o \
9293
$(OBJDIR)/Batch.o \
9394
$(OBJDIR)/ParticleSystem.o \
@@ -99,7 +100,6 @@ OBJECTS := \
99100
$(OBJDIR)/GUI.o \
100101
$(OBJDIR)/Input.o \
101102
$(OBJDIR)/EulerNode.o \
102-
$(OBJDIR)/KinematicCharacterController.o \
103103
$(OBJDIR)/GameState.o \
104104
$(OBJDIR)/pn.o \
105105
$(OBJDIR)/pnUtil.o \
@@ -189,9 +189,6 @@ $(OBJDIR)/Console.o: src/Console.cpp
189189
$(OBJDIR)/Mesh.o: src/Mesh.cpp
190190
@echo $(notdir $<)
191191
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
192-
$(OBJDIR)/DumbyPartitioner.o: src/DumbyPartitioner.cpp
193-
@echo $(notdir $<)
194-
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
195192
$(OBJDIR)/Material.o: src/Material.cpp
196193
@echo $(notdir $<)
197194
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -201,6 +198,9 @@ $(OBJDIR)/Main.o: src/Main.cpp
201198
$(OBJDIR)/Engine.o: src/Engine.cpp
202199
@echo $(notdir $<)
203200
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
201+
$(OBJDIR)/DummyPartitioner.o: src/DummyPartitioner.cpp
202+
@echo $(notdir $<)
203+
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
204204
$(OBJDIR)/TrackerNode.o: src/TrackerNode.cpp
205205
@echo $(notdir $<)
206206
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -240,6 +240,9 @@ $(OBJDIR)/Developer.o: src/Developer.cpp
240240
$(OBJDIR)/Graphics.o: src/Graphics.cpp
241241
@echo $(notdir $<)
242242
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
243+
$(OBJDIR)/Light.o: src/Light.cpp
244+
@echo $(notdir $<)
245+
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
243246
$(OBJDIR)/Log.o: src/Log.cpp
244247
@echo $(notdir $<)
245248
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -273,9 +276,6 @@ $(OBJDIR)/Input.o: src/Input.cpp
273276
$(OBJDIR)/EulerNode.o: src/EulerNode.cpp
274277
@echo $(notdir $<)
275278
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
276-
$(OBJDIR)/KinematicCharacterController.o: src/extra/KinematicCharacterController.cpp
277-
@echo $(notdir $<)
278-
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
279279
$(OBJDIR)/GameState.o: src/game/GameState.cpp
280280
@echo $(notdir $<)
281281
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"

‎qor.vcxproj

+7-8
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<AdditionalIncludeDirectories>third_party\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6767
</ResourceCompile>
6868
<Link>
69-
<AdditionalDependencies>GL.lib;GLU.lib;SDL.lib;SDLmain.lib;GLEW.lib;assimp.lib;IL.lib;ILU.lib;openal.lib;alut.lib;BulletSoftBody.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;lua5.1.lib;luabind.lib;%(AdditionalDependencies)</AdditionalDependencies>
69+
<AdditionalDependencies>GL.lib;GLU.lib;SDL.lib;SDLmain.lib;GLEW.lib;assimp.lib;IL.lib;ILU.lib;openal.lib;alut.lib;Newton.lib;dJointLibrary.lib;LinearMath.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;lua5.1.lib;luabind.lib;%(AdditionalDependencies)</AdditionalDependencies>
7070
<OutputFile>$(OutDir)qor.exe</OutputFile>
7171
<AdditionalLibraryDirectories>third_party\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
7272
<SubSystem>Windows</SubSystem>
@@ -94,7 +94,7 @@
9494
<AdditionalIncludeDirectories>third_party\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9595
</ResourceCompile>
9696
<Link>
97-
<AdditionalDependencies>GL.lib;GLU.lib;SDL.lib;SDLmain.lib;GLEW.lib;assimp.lib;IL.lib;ILU.lib;openal.lib;alut.lib;BulletSoftBody.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;lua5.1.lib;luabind.lib;%(AdditionalDependencies)</AdditionalDependencies>
97+
<AdditionalDependencies>GL.lib;GLU.lib;SDL.lib;SDLmain.lib;GLEW.lib;assimp.lib;IL.lib;ILU.lib;openal.lib;alut.lib;Newton.lib;dJointLibrary.lib;LinearMath.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;lua5.1.lib;luabind.lib;%(AdditionalDependencies)</AdditionalDependencies>
9898
<OutputFile>$(OutDir)qor.exe</OutputFile>
9999
<AdditionalLibraryDirectories>third_party\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100100
<SubSystem>Windows</SubSystem>
@@ -143,10 +143,10 @@
143143
<ClInclude Include="src\Batch.h" />
144144
<ClInclude Include="src\IPhysicsObject.h" />
145145
<ClInclude Include="src\Shader.h" />
146-
<ClInclude Include="src\DumbyPartitioner.h" />
147146
<ClInclude Include="src\IRenderable.h" />
148147
<ClInclude Include="src\Shadow.h" />
149148
<ClInclude Include="src\Node.h" />
149+
<ClInclude Include="src\DummyPartitioner.h" />
150150
<ClInclude Include="src\IStateManager.h" />
151151
<ClInclude Include="src\IRealtime.h" />
152152
<ClInclude Include="src\GUI.h" />
@@ -166,7 +166,6 @@
166166
<ClInclude Include="src\Util.h" />
167167
<ClInclude Include="src\IFallible.h" />
168168
<ClInclude Include="src\AITypeParser.h" />
169-
<ClInclude Include="src\extra\KinematicCharacterController.h" />
170169
<ClInclude Include="src\LuaScript\LuaState.h" />
171170
<ClInclude Include="src\transition\TransitionState.h" />
172171
<ClInclude Include="src\transition\TransitionInfo.h" />
@@ -197,14 +196,14 @@
197196
</ClCompile>
198197
<ClCompile Include="src\Mesh.cpp">
199198
</ClCompile>
200-
<ClCompile Include="src\DumbyPartitioner.cpp">
201-
</ClCompile>
202199
<ClCompile Include="src\Material.cpp">
203200
</ClCompile>
204201
<ClCompile Include="src\Main.cpp">
205202
</ClCompile>
206203
<ClCompile Include="src\Engine.cpp">
207204
</ClCompile>
205+
<ClCompile Include="src\DummyPartitioner.cpp">
206+
</ClCompile>
208207
<ClCompile Include="src\TrackerNode.cpp">
209208
</ClCompile>
210209
<ClCompile Include="src\Entity.cpp">
@@ -231,6 +230,8 @@
231230
</ClCompile>
232231
<ClCompile Include="src\Graphics.cpp">
233232
</ClCompile>
233+
<ClCompile Include="src\Light.cpp">
234+
</ClCompile>
234235
<ClCompile Include="src\Log.cpp">
235236
</ClCompile>
236237
<ClCompile Include="src\Batch.cpp">
@@ -253,8 +254,6 @@
253254
</ClCompile>
254255
<ClCompile Include="src\EulerNode.cpp">
255256
</ClCompile>
256-
<ClCompile Include="src\extra\KinematicCharacterController.cpp">
257-
</ClCompile>
258257
<ClCompile Include="src\game\GameState.cpp">
259258
</ClCompile>
260259
<ClCompile Include="src\pn\pn.cpp">

‎src/AITypeParser.h

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
#ifndef _ASSIMPPARSER_H
2-
#define _ASSIMPPARSER_H
3-
4-
#include "math/common.h"
5-
#include <assimp/assimp.hpp>
6-
#include <assimp/aiScene.h>
7-
#include <assimp/aiPostProcess.h>
8-
9-
namespace AITypeParser
10-
{
11-
inline void parseVector(glm::vec3& v, const aiVector3D& aiv) {
12-
v = glm::vec3(aiv.x, aiv.y, aiv.z);
13-
}
14-
};
15-
16-
#endif
17-
1+
#ifndef _ASSIMPPARSER_H
2+
#define _ASSIMPPARSER_H
3+
4+
#include "math/common.h"
5+
#include <assimp/assimp.hpp>
6+
#include <assimp/aiScene.h>
7+
#include <assimp/aiPostProcess.h>
8+
9+
namespace AITypeParser
10+
{
11+
inline void parseVector(glm::vec3& v, const aiVector3D& aiv) {
12+
v = glm::vec3(aiv.x, aiv.y, aiv.z);
13+
}
14+
};
15+
16+
#endif
17+

0 commit comments

Comments
 (0)