Commit Graph

846 Commits

Author SHA1 Message Date
Michel Selten
9330e553e8 SCons updates
* libraries are now generated in [BUILD_DIR]/lib
* passed the user_options to all libraries now.
  This means I could remove a couple of Export/Import lines.
* Changed the order in source/blender/src/SConscript and
  source/gameengine/SConscript.
  All libraries are now sorted alphabetically. This has no impact on the build
  process.
2004-02-15 19:25:32 +00:00
Michel Selten
2883110a54 SCons updates: (All done by jesterKing)
* Windows .exe file now includes the blender icon.
* Builds with game engine on Windows only.
  I tried building the game engine on Linux, but I get weird errors when
  building with ode. There's a dirty #include path in
  Physics/BlOde/OdePhysicsEnvironment.cpp (../ode/src/joint.h). gcc doesn't
  like this somehow.
* Other platforms need to add a couple of flags to the SConstruct:
  use_sumo, use_ode, solid_include and ode_include
2004-01-20 20:28:39 +00:00
Wouter van Heyst
57a7dfe5a5 - Revert to NaN makefiles 2004-01-05 00:06:11 +00:00
Alejandro Conty Estevez
eff07b8329 Basic initial yafray integration by Eeshlo.
Materials are exported the best we can do by now. It will look almost as in
blender except for the missing procedural textures and some minor issues.
You have to tweak normal modulation amount to get the desired result cause
is not the same in yafray.

We added a panel in render space to adjust some yafray settings (GI and so)

Also we export transparency and reflection using new raytracing settings,
but that will be changed and improved soon.

Remember that you have to set YFexport path in user defaults and yafray must
be on path (version 0.0.6)

We added the "yafray" button to activate all this stuff in the render window.
Panel and settings are only shown when checked.

So now when activated the code calls yafray export instead of the internal
renderer and finally the resulting image is loaded back into render window's
buffer. So animation is also possible and results can be saved using blender
usual scheme.
2004-01-04 22:10:36 +00:00
Chris Want
9bc012f97c A fix for the missing pad1 bug: henceforth, world->pad1 shall be known as
world->gameEngine (a la tuhopuu).
2003-12-31 04:00:26 +00:00
Roel Spruit
ffabbbea8d Nathan Letwory's patch for bug #424 const errors kept MSVC7 projectfiles from compiling. 2003-12-01 15:01:20 +00:00
Chris Want
b92e99d0a8 In ODE, a dVector3 is really a 4D array ... the 3D initialization
used in this file caused the MipsPro 7.4 compiler to choke
... please test on all platforms!
2003-08-23 19:09:52 +00:00
Kent Mein
abede3ca04 A little more cleanup, removed a bunch of unused vars in the code.
Trying to get rid of some of the extra warnings we can ignore ;)

Kent
2003-08-14 15:18:45 +00:00
Kent Mein
6dcc5b030e Further fixes to the old makefiles.
Kent
2003-07-16 19:53:53 +00:00
Kent Mein
8dd015e9b0 Hopefully update for NaN Makefiles for the moving of SoundSystem.
I need to get openal working on my machine before I can test it so
if it doesn't work feel free to fix it.  Hopefully this will be
the majority of the stuff though.

Kent
2003-07-16 19:00:04 +00:00
Chris Want
924a849755 Support for building bf-blender under windows with gcc (huge thanks to
Florian Eggenburger).

Full instructions are in doc/README.windows-gcc.

Main differences from Florian's patch:

- the 'lib' dir should now be the same level as the 'blender' dir (rather
than being a subdir of 'blender'). This is consistent with the other
platforms that bf-blender supports (tuhopuu will also adopt this convention
hopefully soon).

- the script 'free_windows-env.mk' is no longer needed ... see the
docs about how this is overcome (again, tuhopuu will hopefully
also follow this route soon).

- the dlltool dir has it's own Makefile that builds all of the
needed stub libraries from the dll's in cvs.
2003-05-24 20:04:37 +00:00
Chris Want
1f668df514 Irix will now link to ode 2003-03-31 17:27:20 +00:00
Wouter van Heyst
22305bc08d FreeBSD can use the exact same python includes as everyone else 2003-03-25 23:36:40 +00:00
Daniel Dunbar
de09cf7609 Remove references to obsolete misc lib 2003-03-24 17:34:43 +00:00
Daniel Dunbar
9b14fa1cdb Remove unused reference to "blendertimer.h" 2003-03-24 16:38:32 +00:00
Kent Mein
e250a26947 added
#ifdef USE_SUMO_SOLID

around this line.
   #include "SM_Scene.h"

Kent
2003-01-30 03:13:56 +00:00
Kent Mein
4fe03a8923 Looks like the two definitions were inside constructors duh....
So I'm reverting.

Kent
2003-01-22 03:09:30 +00:00
Kent Mein
b018475935 Removed two local vars that were set and then never used.
(for example heres one:   bool isActor = objprop->m_isactor;)

Kent
2003-01-21 18:30:44 +00:00
Kent Mein
6597ac3657 I updated the sumo includes paths to point to the right places...
Probably can just remove the lines from these files but ohh well :)

Kent
2003-01-19 09:04:23 +00:00
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