Skip to content

Commit e716730

Browse files
flipcoderflipcoder
committed
some old uncommitted changes
1 parent 4ccf0e3 commit e716730

19 files changed

+139
-76
lines changed

‎debug.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
pushd bin > /dev/null
3-
kdbg qor
3+
nemiver qor
44
popd > /dev/null

‎premake4.lua

+37-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ solution("qor")
88
kind("WindowedApp")
99
language("C++")
1010
links {
11+
"pthread",
1112
"GL",
1213
"GLU",
1314
"SDL",
@@ -18,16 +19,45 @@ solution("qor")
1819
"ILU",
1920
"openal",
2021
"alut",
21-
"PhysX3Common",
22+
23+
"SimulationController",
24+
"SceneQuery",
25+
"LowLevel",
26+
"LowLevelCloth",
2227
"PhysX3",
28+
"PhysX3Vehicle",
2329
"PhysX3Cooking",
30+
"PhysX3Extensions",
2431
"PhysX3CharacterKinematic",
32+
"RepX3",
33+
"RepXUpgrader3",
34+
"PhysXProfileSDK",
35+
"PhysXVisualDebuggerSDK","PxTask",
36+
"PxTask",
37+
"PhysX3Common",
38+
39+
--"SimulationControllerCHECKED",
40+
--"SceneQueryCHECKED",
41+
--"LowLevelCHECKED",
42+
--"LowLevelClothCHECKED",
43+
--"PhysX3CHECKED",
44+
--"PhysX3VehicleCHECKED",
45+
--"PhysX3CookingCHECKED",
46+
--"PhysX3ExtensionsCHECKED",
47+
--"PhysX3CharacterKinematicCHECKED",
48+
--"RepX3CHECKED",
49+
--"RepXUpgrader3CHECKED",
50+
--"PhysXProfileSDKCHECKED",
51+
--"PhysXVisualDebuggerSDKCHECKED","PxTaskCHECKED",
52+
--"PxTask",
53+
--"PhysX3CommonCHECKED",
54+
2555
--"Newton",
2656
--"dJointLibrary",
2757
--"BulletSoftBody",
2858
--"BulletDynamics",
2959
--"BulletCollision",
30-
"LinearMath",
60+
--"LinearMath",
3161
"ogg",
3262
"vorbis",
3363
"vorbisfile",
@@ -49,7 +79,10 @@ solution("qor")
4979
configuration { "linux" }
5080
includedirs {
5181
"/usr/include/freetype2",
52-
"/usr/include/newton"
82+
"/usr/local/include/physx"
83+
}
84+
links {
85+
"rt"
5386
}
5487
configuration {}
5588

@@ -66,7 +99,7 @@ solution("qor")
6699
configuration {}
67100

68101
configuration { "Debug" }
69-
defines { "DEBUG" }
102+
defines { "DEBUG", "_DEBUG" }
70103
flags { "Symbols" }
71104
configuration { "Release" }
72105
defines { "NDEBUG" }

‎qor.make

+5-9
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ ifeq ($(config),debug)
2323
OBJDIR = obj/Debug
2424
TARGETDIR = bin
2525
TARGET = $(TARGETDIR)/qor
26-
DEFINES += -DDEBUG
27-
INCLUDES += -I/usr/include/freetype2 -I/usr/include/newton -Ithird_party/include
26+
DEFINES += -DDEBUG -D_DEBUG
27+
INCLUDES += -I/usr/include/freetype2 -I/usr/local/include/physx -Ithird_party/include
2828
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
2929
CFLAGS += $(CPPFLAGS) $(ARCH) -g -fno-strict-aliasing -std=c++0x
3030
CXXFLAGS += $(CFLAGS)
3131
LDFLAGS += -Lthird_party/lib
32-
LIBS += -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lPhysX3Common -lPhysX3 -lPhysX3Cooking -lPhysX3CharacterKinematic -lLinearMath -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -langelscript
32+
LIBS += -lpthread -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lSimulationController -lSceneQuery -lLowLevel -lLowLevelCloth -lPhysX3 -lPhysX3Vehicle -lPhysX3Cooking -lPhysX3Extensions -lPhysX3CharacterKinematic -lRepX3 -lRepXUpgrader3 -lPhysXProfileSDK -lPhysXVisualDebuggerSDK -lPxTask -lPhysX3Common -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -langelscript -lrt
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/newton -Ithird_party/include
49+
INCLUDES += -I/usr/include/freetype2 -I/usr/local/include/physx -Ithird_party/include
5050
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
5151
CFLAGS += $(CPPFLAGS) $(ARCH) -O2 -fno-strict-aliasing -std=c++0x
5252
CXXFLAGS += $(CFLAGS)
5353
LDFLAGS += -s -Lthird_party/lib
54-
LIBS += -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lPhysX3Common -lPhysX3 -lPhysX3Cooking -lPhysX3CharacterKinematic -lLinearMath -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -langelscript
54+
LIBS += -lpthread -lGL -lGLU -lSDL -lSDLmain -lGLEW -lassimp -lIL -lILU -lopenal -lalut -lSimulationController -lSceneQuery -lLowLevel -lLowLevelCloth -lPhysX3 -lPhysX3Vehicle -lPhysX3Cooking -lPhysX3Extensions -lPhysX3CharacterKinematic -lRepX3 -lRepXUpgrader3 -lPhysXProfileSDK -lPhysXVisualDebuggerSDK -lPxTask -lPhysX3Common -logg -lvorbis -lvorbisfile -lftgl -lboost_system -lboost_filesystem -langelscript -lrt
5555
RESFLAGS += $(DEFINES) $(INCLUDES)
5656
LDDEPS +=
5757
LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
@@ -78,7 +78,6 @@ OBJECTS := \
7878
$(OBJDIR)/TrackerNode.o \
7979
$(OBJDIR)/Entity.o \
8080
$(OBJDIR)/Renderer.o \
81-
$(OBJDIR)/Path.o \
8281
$(OBJDIR)/Frustum.o \
8382
$(OBJDIR)/Spectator.o \
8483
$(OBJDIR)/Freq.o \
@@ -213,9 +212,6 @@ $(OBJDIR)/Entity.o: src/Entity.cpp
213212
$(OBJDIR)/Renderer.o: src/Renderer.cpp
214213
@echo $(notdir $<)
215214
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
216-
$(OBJDIR)/Path.o: src/Path.cpp
217-
@echo $(notdir $<)
218-
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
219215
$(OBJDIR)/Frustum.o: src/Frustum.cpp
220216
@echo $(notdir $<)
221217
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"

‎qor.vcxproj

+4-7
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<ClCompile>
5353
<Optimization>Disabled</Optimization>
5454
<AdditionalIncludeDirectories>third_party\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
55-
<PreprocessorDefinitions>FS_IGNORE_CASE;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
55+
<PreprocessorDefinitions>FS_IGNORE_CASE;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5656
<MinimalRebuild>true</MinimalRebuild>
5757
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
5858
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -62,11 +62,11 @@
6262
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
6363
</ClCompile>
6464
<ResourceCompile>
65-
<PreprocessorDefinitions>FS_IGNORE_CASE;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
65+
<PreprocessorDefinitions>FS_IGNORE_CASE;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
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;PhysX3Common.lib;PhysX3.lib;PhysX3Cooking.lib;PhysX3CharacterKinematic.lib;LinearMath.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;angelscript.lib;%(AdditionalDependencies)</AdditionalDependencies>
69+
<AdditionalDependencies>pthread.lib;GL.lib;GLU.lib;SDL.lib;SDLmain.lib;GLEW.lib;assimp.lib;IL.lib;ILU.lib;openal.lib;alut.lib;SimulationControllerCHECKED.lib;SceneQueryCHECKED.lib;LowLevelCHECKED.lib;LowLevelClothCHECKED.lib;PhysX3CHECKED.lib;PhysX3VehicleCHECKED.lib;PhysX3CookingCHECKED.lib;PhysX3ExtensionsCHECKED.lib;PhysX3CharacterKinematicCHECKED.lib;RepX3CHECKED.lib;RepXUpgrader3CHECKED.lib;PhysXProfileSDKCHECKED.lib;PhysXVisualDebuggerSDKCHECKED.lib;PxTaskCHECKED.lib;PxTask.lib;PhysX3CommonCHECKED.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;angelscript.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;PhysX3Common.lib;PhysX3.lib;PhysX3Cooking.lib;PhysX3CharacterKinematic.lib;LinearMath.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;angelscript.lib;%(AdditionalDependencies)</AdditionalDependencies>
97+
<AdditionalDependencies>pthread.lib;GL.lib;GLU.lib;SDL.lib;SDLmain.lib;GLEW.lib;assimp.lib;IL.lib;ILU.lib;openal.lib;alut.lib;SimulationControllerCHECKED.lib;SceneQueryCHECKED.lib;LowLevelCHECKED.lib;LowLevelClothCHECKED.lib;PhysX3CHECKED.lib;PhysX3VehicleCHECKED.lib;PhysX3CookingCHECKED.lib;PhysX3ExtensionsCHECKED.lib;PhysX3CharacterKinematicCHECKED.lib;RepX3CHECKED.lib;RepXUpgrader3CHECKED.lib;PhysXProfileSDKCHECKED.lib;PhysXVisualDebuggerSDKCHECKED.lib;PxTaskCHECKED.lib;PxTask.lib;PhysX3CommonCHECKED.lib;ogg.lib;vorbis.lib;vorbisfile.lib;ftgl.lib;boost_system.lib;boost_filesystem.lib;angelscript.lib;%(AdditionalDependencies)</AdditionalDependencies>
9898
<OutputFile>$(OutDir)qor.exe</OutputFile>
9999
<AdditionalLibraryDirectories>third_party\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100100
<SubSystem>Windows</SubSystem>
@@ -127,7 +127,6 @@
127127
<ClInclude Include="src\NodeFactory.h" />
128128
<ClInclude Include="src\Sound.h" />
129129
<ClInclude Include="src\IConfig.h" />
130-
<ClInclude Include="src\Path.h" />
131130
<ClInclude Include="src\Renderer.h" />
132131
<ClInclude Include="src\IScriptable.h" />
133132
<ClInclude Include="src\IState.h" />
@@ -216,8 +215,6 @@
216215
</ClCompile>
217216
<ClCompile Include="src\Renderer.cpp">
218217
</ClCompile>
219-
<ClCompile Include="src\Path.cpp">
220-
</ClCompile>
221218
<ClCompile Include="src\Frustum.cpp">
222219
</ClCompile>
223220
<ClCompile Include="src\Spectator.cpp">

‎src/Animation.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
#include "Animation.h"
2-
3-

‎src/IFallible.h

+8-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ class IFallible
77
{
88
protected:
99

10-
virtual void setError(const std::string& err){
11-
m_sError = err;
12-
//std::cout << "Error: " << err << std::endl;
10+
void fail() {
11+
failsafe();
12+
throw Failure();
1313
}
1414

1515
public:
@@ -28,6 +28,11 @@ class IFallible
2828
virtual std::string moveError() { return std::move(m_sError); }
2929
virtual void clearError() { m_sError = ""; }
3030

31+
virtual void setError(const std::string& err){
32+
m_sError = err;
33+
//std::cout << "Error: " << err << std::endl;
34+
}
35+
3136
private:
3237

3338
std::string m_sError;

‎src/IRealtime.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#ifndef _IREALTIME_H
22
#define _IREALTIME_H
33

4-
#include "IFallible.h"
4+
#include "Util.h"
55

66
class IRealtime
77
{
88
public:
99
virtual ~IRealtime() {}
10+
1011
virtual void logic(unsigned int t) = 0;
12+
//virtual void logic(unsigned int t) { return logic(t * 1000.0f); };
13+
//virtual void logic(float t) { return logic(round_int(t * 0.001f)); }
1114
//virtual bool logic(unsigned int advance) {return logic(advance*0.001f);}
1215
//virtual bool logic(unsigned int advance) {return false;}
1316
};

‎src/IState.h

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "IRealtime.h"
55
#include "IRenderable.h"
6+
#include "IFallible.h"
67

78
class IState: public IRealtime, public IRenderable, public IFallible
89
{

‎src/Input.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ int Input :: keyRepeat(int delay, int interval)
7171

7272
void Input :: clearKeys()
7373
{
74-
for(int i=0;i<MAX_KEYS;i++)
75-
m_key[i] = false;
74+
//for(int i=0;i<MAX_KEYS;i++)
75+
// m_key[i] = false;
76+
m_key.fill(false);
7677
}
7778

7879
bool Input :: key(int key) const

‎src/Input.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <string>
88
#include <memory>
9+
#include <array>
910
#include "GfxAPI.h"
1011
#include "Settings.h"
1112
#include "IRealtime.h"
@@ -45,12 +46,12 @@ class Input : public IRealtime
4546
for(unsigned int i=0;i<MAX_BUTTONS;i++)
4647
btn[i] = 0;
4748
}
48-
unsigned int btn[MAX_BUTTONS];
49+
std::array<unsigned int, MAX_BUTTONS> btn;
4950
};
5051
InputController inputController[MAX_INPUT_CONTROLLERS];
5152

5253
static const unsigned int MAX_KEYS = 512;
53-
bool m_key[MAX_KEYS];
54+
std::array<bool, MAX_KEYS> m_key;
5455

5556
std::string m_tempString;
5657
//std::string *m_destString;

‎src/Node.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class Scene;
3333

3434
class Node : public IRealtime, public std::enable_shared_from_this<Node>
3535
{
36-
3736
protected:
3837

3938
// mutable?: Derived classes may do matrix computation on-the-fly, during an accessor call.
@@ -44,6 +43,7 @@ class Node : public IRealtime, public std::enable_shared_from_this<Node>
4443
unsigned int m_Layer; // "Node Layer" refers to scene node categories
4544
int m_SortBias; // Sort order (normal objects default to 0), bigger numbers occur later
4645

46+
// flags for each pendable cache
4747
enum {
4848
PC_WORLD_MATRIX = BIT(0),
4949
PC_MASK = MASK(1)
@@ -58,6 +58,10 @@ class Node : public IRealtime, public std::enable_shared_from_this<Node>
5858

5959
public:
6060

61+
static bool depthCompare(const Node* a, const Node* b) {
62+
return a->sortBias() < b->sortBias();
63+
}
64+
6165
//class ScopedMatrixMod
6266
//{
6367
//private:
@@ -96,7 +100,6 @@ class Node : public IRealtime, public std::enable_shared_from_this<Node>
96100
unsigned int flags = Node::defaultFlags(),
97101
unsigned int layer = 0);
98102
virtual ~Node();
99-
//Node(const Node& n);
100103

101104
// Callbacks for parent when child nodes are added/removed
102105
virtual void _onAdd(Node* n) {}

‎src/Path.cpp

-10
This file was deleted.

‎src/Path.h

-18
This file was deleted.

‎src/Physics.cpp

+29-5
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,51 @@
99
#include <iostream>
1010
#include <memory>
1111
using namespace std;
12+
//using namespace physx;
1213

1314
Physics::Physics()
1415
{
1516
nullify();
1617

17-
18+
//if(!(m_pFoundation = PxCreateFoundation(
19+
// PX_PHYSICS_VERSION,
20+
// *m_DefaultAllocatorCallback,
21+
// *m_DefaultErrorCallback
22+
//)))
23+
// fail();
24+
//bool recordMemoryAllocations = true;
25+
//if(!(m_pProfileZoneManager = &PxProfileZoneManager::createProfileZoneManager(m_pFoundation)))
26+
// fail();
27+
//if(!(m_pPhysics = PxCreatePhysics(PX_PHYSICS_VERSION,
28+
// *m_pFoundation,
29+
// PxTolerancesScale(),
30+
// recordMemoryAllocations,
31+
// m_pProfileZoneManager
32+
//)))
33+
// fail();
34+
//if(!(m_pCooking = PxCreateCooking(PX_PHYSICS_VERSION, *m_pFoundation, PxCookingParams())))
35+
// fail();
36+
//if(!PxInitExtensions(*m_pPhysics))
37+
// fail();
1838
}
1939

2040
Physics::~Physics()
2141
{
22-
cleanup();
42+
failsafe();
2343
}
2444

2545
void Physics :: nullify()
2646
{
27-
47+
//m_pFoundation = NULL;
48+
//m_pProfileZoneManager = NULL;
49+
//m_pPhysics = NULL;
50+
//m_pCooking = NULL;
2851
}
2952

30-
void Physics :: cleanup()
53+
void Physics :: failsafe()
3154
{
32-
55+
//m_pPhysics->release();
56+
//m_pFoundation->release();
3357
nullify();
3458
}
3559

0 commit comments

Comments
 (0)