[Bf-committers] Game engine patches

[Chris Want]

Hey Kester,

Here are the probs:

1) (minor) When patching I get:

patching file tuhopuu2/source/gameengine/Makefile.am
Hunk #2 FAILED at 30.
1 out of 2 hunks FAILED -- saving rejects to file 
tuhopuu2/source/gameengine/Makefile.am.rej

That Makefile.am.rej looks like:

***************
*** 29,35 ****

   libgameblender_player_la_SOURCES =
   libgameblender_player_la_LIBADD = \
         GamePlayer/libgameblender_player.la

-
- LIBS =
--- 30,35 ----

   libgameblender_player_la_SOURCES =
   libgameblender_player_la_LIBADD = \
+       libblender_gameengine.la \
         GamePlayer/libgameblender_player.la

2) source/gameengine/Converter/Makefile needed a
CPPFLAGS += -I$(NAN_ODE)/include added.

3) source/gameengine/Ketsji/Makefile needed a
CPPFLAGS += -I$(NAN_ODE)/include added.

4) source/gameengine/Physics/BlOde/OdeConeCollider.cpp
seems to be incomplete (the top of the file looks
really sparce and it has no includes or anything).
I tried adding a #include <ode/ode.h>, but it
still stopped, complaining skip, dConeClass, o2, etc
are undeclared ... maybe the patch for this file
got munched? Anyways, fixing this is beyond my abilities
so I'll have to try again after this issue is addressed.

Regards,
Chris



Kester Maddock wrote:
> Hi all,
> 
> I have some patches for ODE physics in the game engine at:
> http://mysite.reblended.com/alien-xmp/tuhopuu2-gameengine-patch.tar.gz (24k)
> http://mysite.reblended.com/alien-xmp/tuhopuu2-gameengine-test.tar.gz (579k)
> (or they will be in about 10min.)
> 
> ..patch.tar.gz contains the patches & -test.tar.gz contains some testing 
> .blends!
> 
> You will also need to update ODE from ODE cvs and compile w/ Opcode (the mesh 
> library in ODE)
> 
> These patches are for tuhopuu2 - I'll leave bf-blender for solid.
> 
> Kester
> 
> _______________________________________________
> Bf-committers mailing list
> Bf-committers@blender.org
> http://www.blender.org/mailman/listinfo/bf-committers