josh/anaglym
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finished implementing object cloning support; added dwlogo.phy; removed .blend1 backup files; added DEBUG parameter to Makefile

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@63 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-10-11 23:42:16 +00:00
parent f237390761
commit e6556d8bf3
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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

2
anaglym.cc
View File

@ -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()

BIN
tests/ball.blend1
View File

Binary file not shown.

11
tests/ballstairs.lua
View File

@ -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)

1
tests/dwlogo.phy Normal file
View File

@ -0,0 +1 @@
cube "Cube.006" 9.599437 5.977658 0.500298 0.022008 0.762484 0.250770 0.000000 0.000000 0.000000