archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
229 Commits 660 Branches 0 Tags
80acb0412478a6705f7a3f364acd34c2045a34bf
Commit Graph

27 Commits

Author SHA1 Message Date
Hans Lambermont
1a32da86f1 skip BlOde for irix 2003-01-11 22:10:00 +00:00
Stefan Gartner
3531f874e0 added a buch of 
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
(also for <GL/glu.h>)

so that people don't have to create symlinks in
/System/Library/Frameworks/OpenGL.framework on Mac OS X
(Charles Wardlaw)
 2003-01-07 00:18:59 +00:00
Hans Lambermont
080dd299d6 - use ODE in lib/ for FreeBSD 
- use default python library path
- remove obsolete SSR comments
 2003-01-04 20:20:54 +00:00
Hans Lambermont
302399b9d0 and the other FreeBSD python locations. 2003-01-04 01:41:19 +00:00
Michel Selten
0a51feab36 These updates enable the build of the gameengine 
(configure --enable-gameengine). However, you still need to manually configure,
compile and install ode.

* Following the original NaN makefile, I removed the TerraplayNetwork files
  from the build. (Moved the two files to EXTRA_DIST).

* Pass a const char * to Py_BuildValue instead of a STR_String in
  BL_ActionActuator.cpp

* Added some include directories in Makefile.am's

Michel
 2003-01-03 21:36:16 +00:00
Kent Mein
e9a7e30758 Removed another unused var and cleaned up a couple of lines of code 
Here is the diff

Kent

Index: GameLogic/SCA_KeyboardSensor.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp,v
retrieving revision 1.3
diff -u -r1.3 SCA_KeyboardSensor.cpp
--- GameLogic/SCA_KeyboardSensor.cpp    25 Nov 2002 15:29:42 -0000      1.3
+++ GameLogic/SCA_KeyboardSensor.cpp    30 Dec 2002 07:09:42 -0000
@@ -167,14 +167,14 @@
        } else
        {

-         //            cerr << "======= SCA_KeyboardSensor::Evaluate:: peeking at key status" << endl;
-               const SCA_InputEvent & inevent = inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) m_hotkey);
+       //              cerr << "======= SCA_KeyboardSensor::Evaluate:: peeking at key status" << endl;
+               const SCA_InputEvent & inevent = inputdev->GetEventValue(
+                       (SCA_IInputDevice::KX_EnumInputs) m_hotkey);

-               //              cerr << "======= SCA_KeyboardSensor::Evaluate::
status: " << inevent.m_status << endl;
+       //              cerr << "======= SCA_KeyboardSensor::Evaluate:: status: " << inevent.m_status << endl;

                if (inevent.m_status == SCA_InputEvent::KX_NO_INPUTSTATUS)
                {
-                       int i=4;
                } else
                {
                        if (inevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED)
 2002-12-30 07:13:26 +00:00
Kent Mein
cc95cdd390 Removed unused var here is the diff: 
Kent


Index: gameengine/Ketsji/KX_PyConstraintBinding.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp,v
retrieving revision 1.3
diff -u -r1.3 KX_PyConstraintBinding.cpp
--- gameengine/Ketsji/KX_PyConstraintBinding.cpp        25 Nov 2002 15:29:49 -0000      1.3
+++ gameengine/Ketsji/KX_PyConstraintBinding.cpp        30 Dec 2002 07:08:18 -0000
@@ -128,7 +128,6 @@
 {
        int constraintid;

-       int len = PyTuple_Size(args);
        if (PyArg_ParseTuple(args,"i",&constraintid))
        {
                if (g_physics_env)
 2002-12-30 07:09:23 +00:00
Kent Mein
f1c4f705a1 Removed the config.h thing from the .h's in the source dir. 
So we should be all set now :)

Kent
--
mein@cs.umn.edu
 2002-12-27 13:11:01 +00:00
Maarten Gribnau
1737a73a4a Disabled player's check for Publisher file for input. 
Maarten
 2002-12-22 22:02:57 +00:00
Maarten Gribnau
2417e61e16 Fixed binary files stored as text files for plug-ins 
Maarten
 2002-12-22 22:00:55 +00:00
Kent Mein
50ec450e64 Had to make the patch for casting a little more complicated. 
m_MotionState->getWorldOrientation((float)worldquat[1],
        (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);

Is now:

#ifdef dDOUBLE
      m_MotionState->getWorldOrientation((float)worldquat[1],
        (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);
#else
      m_MotionState->getWorldOrientation(worldquat[1],
        worldquat[2],worldquat[3],worldquat[0]);
#endif


Kent
--
mein@cs.umn.edu
 2002-12-03 15:52:47 +00:00
Kent Mein
73aef31b52 I got this patch from sgefant Mostly its just casting floats as floats. 
(also adding a couple of include pathes)
changes in Ode*.cpp to get it compile with gcc 2.95.4
to make it compile with ./configure --with-gameengine
                        --enable-gameplayer


Kent
--
mein@cs.umn.edu
 2002-12-02 16:30:13 +00:00
Kent Mein
209a2ede2c Last of the config.h mods... 
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

added to these files.

Kent
--
mein@cs.umn.edu
 2002-11-25 15:29:57 +00:00
Kent Mein
b9a19f1ea7 Did all of the .h's in source 
(adding)
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

also the Makefile.in's were from previous patch adding
the system depend stuff to configure.ac

Kent
--
mein@cs.umn.edu
 2002-11-25 11:16:17 +00:00
Kent Mein
98e307346c Fixed a typo. Had a [ added. 
Kent
--
mein@cs.umn.edu
 2002-11-19 00:09:54 +00:00
Kent Mein
97827c21d0 I Just modified the Makefile to use the definitions instead of hard paths. 
-CPPFLAGS += -I../../../../sumo/Fuzzics/include
-CPPFLAGS += -I../../../../sumo/include
+CPPFLAGS += -I$(NAN_FUZZICS)/include
+CPPFLAGS += -I$(NAN_SUMO)/include

Kent
--
mein@cs.umn.edu
 2002-11-06 02:09:02 +00:00
Maarten Gribnau
2d5514be28 Brought back the sumo physics controllers and undid game engine make file 
changes.
Instead modified the top level nan_definitions.mk to point the NAN_SUMO and
NAN_FUZZICS to the right locations.
Maarten
 2002-11-05 20:20:50 +00:00
Kent Mein
9bddc20bd3 changed: 
friend SG_Controller;
to:
 friend class SG_Controller;

gcc-3.2 was complaining that it wasn't defined.

Kent
--
mein@cs.umn.edu
 2002-11-05 19:54:23 +00:00
Maarten Gribnau
c458cc7310 Forgot to remove sumo physics controllers 
Maarten (mail@maartengribnau.com)
 2002-11-04 21:47:37 +00:00
Maarten Gribnau
0698cafb6a removed last traces of sumo for Makefile users 
1. Removed KX_SumoPhysicsController.h and KX_SumoPhysicsController.cpp
2. Changed some Makefiles to skip sumo
Maarten (mail@maartengribnau.com)
 2002-11-04 20:22:33 +00:00
Kent Mein
01bff70383 fixed spacing in the headers to get rid of some warnings and some other 
little minor spacing issues.
 2002-10-30 02:07:20 +00:00
Erwin Coumans
b8c8715c20 moved KX_Python_... files from ketsji to expressions 
(ketsji was a very wrong location because it caused circular dependencies between expressions, gamelogic and ketsji)
expressions and game logic are not dependent on ketsji anymore (only the other way around)
also removed circular includes in makefiles and projectfiles
 2002-10-21 19:23:52 +00:00
Norman Lin
ae459bfc12 added notes on collisions between dynas and "static moving" geometry (kinematically controlled) 2002-10-19 13:49:00 +00:00
Norman Lin
1ca9bded73 added todo item about compatibility with 2.25 2002-10-18 18:53:45 +00:00
Norman Lin
b7dadcfefd first checkin of ode blender engine files 2002-10-18 15:46:57 +00:00
Norman Lin
1b15961786 First checkin of core ODE functionality. See OdePhysicsController.cpp for a todo list. 2002-10-18 14:36:34 +00:00
Hans Lambermont
12315f4d0e Initial revision 2002-10-12 11:37:38 +00:00