diff --git a/Makefile b/Makefile index 60c2806..4155cf5 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,11 @@ export CFLAGS := $(LUAINCLUDE) $(SDLINCLUDE) $(ODEINCLUDE) -O2 -Wall export CXXFLAGS := $(CFLAGS) export LDFLAGS := $(LUALIBS) $(ODELIBS) $(GLLIBS) $(WINDOWSLIBS) $(SDLLIBS) +ifdef DEBUG + CFLAGS += -g + CXXFLAGS += -g +endif + all: $(TARGET) $(TARGET): $(OBJS) wfobj/WFObj.o OdeWorld/OdeWorld.o diff --git a/anaglym.cc b/anaglym.cc index ef47efc..67b297f 100644 --- a/anaglym.cc +++ b/anaglym.cc @@ -337,7 +337,7 @@ void Engine::doPhysics() Engine::Object::Object(const Engine::Object & orig) { m_display_list = orig.m_display_list; - m_ode_object = new OdeWorld::Object(*m_ode_object); + m_ode_object = new OdeWorld::Object(*orig.m_ode_object); } void Engine::Object::draw() diff --git a/tests/ball.blend1 b/tests/ball.blend1 deleted file mode 100755 index d0d1d1f..0000000 Binary files a/tests/ball.blend1 and /dev/null differ diff --git a/tests/ballstairs.lua b/tests/ballstairs.lua index 00d156c..82d3cc3 100755 --- a/tests/ballstairs.lua +++ b/tests/ballstairs.lua @@ -13,10 +13,19 @@ function update() ag.startFrame() arena:draw() ball:draw() + ball2:draw() + ball3:draw() + logo:draw() ag.endFrame() end --ag.setCamera(8, -8, 15, -8, 8, 4, 0, 0, 1) arena = ag.loadStaticModel("boxarena") ball = ag.loadModel("ball") -ball:setPosition(-7, 7.4, 12); +ball:setPosition(-7, 7.4, 12) +ball2 = ball:clone() +ball2:setPosition(-7, 7.4, 14) +ball3 = ball:clone() +ball3:setPosition(-7, 7.4, 16) +logo = ag.loadModel("dwlogo") +logo:setPosition(0, 2, 11) diff --git a/tests/dwlogo.phy b/tests/dwlogo.phy new file mode 100644 index 0000000..f4dc36e --- /dev/null +++ b/tests/dwlogo.phy @@ -0,0 +1 @@ +cube "Cube.006" 9.599437 5.977658 0.500298 0.022008 0.762484 0.250770 0.000000 0.000000 0.000000