blender-staging.git
17 years agoBuild and install ode in lib/<platform>
Hans Lambermont [Sat, 11 Jan 2003 19:14:34 +0000 (19:14 +0000)]
Build and install ode in lib/<platform>
Only enabled for Linux now, and not even tested yet :-P (what do you
mean 'in a hurry' ;-)

17 years agoRevert NAN_OPENSSL to it's previous value of '/usr' on FreeBSD
Wouter van Heyst [Sat, 11 Jan 2003 02:37:11 +0000 (02:37 +0000)]
Revert NAN_OPENSSL to it's previous value of '/usr' on FreeBSD

17 years agoI went whole hog on the definitions each platform has its own block
Kent Mein [Fri, 10 Jan 2003 22:45:25 +0000 (22:45 +0000)]
I went whole hog on the definitions  each platform has its own block
and there is a block at the very end for platforms not specified above.

(not all of the defintions are in the platform's for example there
is no need for  export NAN_IKSOLVER ?= $(LCGDIR)/iksolver
to be repeated all over the place, all of the ones you'll probably
want to change are in the platform specific blocks though)

This allows all platforms to be overridden by env vars...

Kent

17 years agomodified the default path to python for macosX to /sw
Kent Mein [Fri, 10 Jan 2003 16:15:49 +0000 (16:15 +0000)]
modified the default path to python for macosX to /sw

which is where fink puts it.

Kent

17 years agoAdded another fink bit under the macosX instructions.
Kent Mein [Tue, 7 Jan 2003 18:16:58 +0000 (18:16 +0000)]
Added another fink bit under the macosX instructions.

6. python22 ((addes the static lib for python) fink install python22)
        You will probably want to select python22-nox-shlibs when
        it asks you.

        After you have done this you should install the mx lib from:
        http://www.egenix.com/files/python/mxTextTools.html

Kent

17 years agoLinux now also uses ode from lib/
Wouter van Heyst [Tue, 7 Jan 2003 05:08:10 +0000 (05:08 +0000)]
Linux now also uses ode from lib/

17 years agoadded a buch of
Stefan Gartner [Tue, 7 Jan 2003 00:18:59 +0000 (00:18 +0000)]
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)

17 years agoJohn Walton's changes for Irix mips3 (NaN makefiles build)
Hans Lambermont [Mon, 6 Jan 2003 23:01:28 +0000 (23:01 +0000)]
John Walton's changes for Irix mips3 (NaN makefiles build)

17 years agoOk took out the ln -s for the GL headers.
Kent Mein [Mon, 6 Jan 2003 21:45:02 +0000 (21:45 +0000)]
Ok took out the ln -s for the GL headers.
A little looking shows that MacOSX uses OpenGL/blah.h
instead of GL/blah.h

Looks like time for more ifdef's

I also added a note to fink install cvs
(fixes a bug in the cvs you get by default with empty dirs)

Kent

17 years agoupdates because of python changes
Maarten Gribnau [Mon, 6 Jan 2003 21:38:26 +0000 (21:38 +0000)]
updates because of python changes
Maarten

17 years agoOk hopefully this is the last one for macosX ;)
Kent Mein [Mon, 6 Jan 2003 21:30:28 +0000 (21:30 +0000)]
Ok hopefully this is the last one for macosX ;)

Added this:
Step 4:
cd /System/Library/Frameworks/OpenGL.framework/
ln -s Headers GL

Kent

17 years agoadded for MacOSX instructions: (This has the static lib for libcrypto)
Kent Mein [Mon, 6 Jan 2003 21:09:09 +0000 (21:09 +0000)]
added for MacOSX instructions:  (This has the static lib for libcrypto)
2. openssl-dev (fink install openssl-dev)

Kent

17 years agoUpdated the fink calls to libjpeg and libpng instead of just jpeg and png.
Kent Mein [Mon, 6 Jan 2003 20:23:45 +0000 (20:23 +0000)]
Updated the fink calls to libjpeg and libpng instead of just jpeg and png.

Kent

17 years agoRemoved references to modules that do not exist. The python interface is
Michel Selten [Mon, 6 Jan 2003 17:27:43 +0000 (17:27 +0000)]
Removed references to modules that do not exist. The python interface is
broken, but it should give 0 errors when building.

Michel

17 years agoon Mac OS X run ranlib on libfrozen.a after creating it
Stefan Gartner [Mon, 6 Jan 2003 17:22:57 +0000 (17:22 +0000)]
on Mac OS X run ranlib on libfrozen.a after creating it

17 years ago- DEFFILE needed for linking Netscape Blender plugin now points to local
Frank van Beek [Sun, 5 Jan 2003 17:58:46 +0000 (17:58 +0000)]
- DEFFILE needed for linking Netscape Blender plugin now points to local
  version of npB3DPlg.def

17 years agocleanup.
Hans Lambermont [Sun, 5 Jan 2003 14:28:33 +0000 (14:28 +0000)]
cleanup.

17 years agoremove ssr leftovers
Hans Lambermont [Sun, 5 Jan 2003 14:27:57 +0000 (14:27 +0000)]
remove ssr leftovers

17 years agocpifdiff.sh died with an error when $(LCGDIR)/$(LIBNAME)/include/blenkey.h
Stefan Gartner [Sat, 4 Jan 2003 21:58:04 +0000 (21:58 +0000)]
cpifdiff.sh died with an error when $(LCGDIR)/$(LIBNAME)/include/blenkey.h
didn't exist instead of installing it as it should.

-       @../tools/cpifdiff.sh blenkey.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h
+       @../tools/cpifdiff.sh blenkey.h $(LCGDIR)/$(LIBNAME)/include/

sgefant

17 years ago- use ODE in lib/ for FreeBSD
Hans Lambermont [Sat, 4 Jan 2003 20:20:54 +0000 (20:20 +0000)]
- use ODE in lib/ for FreeBSD
- use default python library path
- remove obsolete SSR comments

17 years ago- replaced #elif with more correct version:
Frank van Beek [Sat, 4 Jan 2003 18:17:50 +0000 (18:17 +0000)]
- replaced #elif with more correct version:

< #elif _WIN32
---
> #elif defined(_WIN32)

17 years agolibfrozen will be built only once until one of the python files is changed.
Michel Selten [Sat, 4 Jan 2003 17:31:11 +0000 (17:31 +0000)]
libfrozen will be built only once until one of the python files is changed.

Michel

17 years ago- replaced files with the original versions that also contain 32x32 and
Frank van Beek [Sat, 4 Jan 2003 17:18:50 +0000 (17:18 +0000)]
- replaced files with the original versions that also contain 32x32 and
  8 bit icons.

17 years ago- on windows alcGetError() has no arguments. On other platforms it does.
Frank van Beek [Sat, 4 Jan 2003 16:46:49 +0000 (16:46 +0000)]
- on windows alcGetError() has no arguments. On other platforms it does.

17 years ago- we're using python22.lib instead of python20.lib nowadays
Frank van Beek [Sat, 4 Jan 2003 16:29:09 +0000 (16:29 +0000)]
- we're using python22.lib instead of python20.lib nowadays

17 years ago- when compiling on windows, override CC=gcc with CC=..../cl_wrapper.pl
Frank van Beek [Sat, 4 Jan 2003 16:27:26 +0000 (16:27 +0000)]
- when compiling on windows, override CC=gcc with CC=..../cl_wrapper.pl
  and use the Python.h in the lib/windows/python/include directory.
  MSVC++ doesn't like linking with a gcc compiled frozen library.

17 years agoWorkaround for the header file copying dependency hell
Hans Lambermont [Sat, 4 Jan 2003 15:07:25 +0000 (15:07 +0000)]
Workaround for the header file copying dependency hell

17 years agoand the other FreeBSD python locations.
Hans Lambermont [Sat, 4 Jan 2003 01:41:19 +0000 (01:41 +0000)]
and the other FreeBSD python locations.

17 years agoanother FreeBSD python location change
Hans Lambermont [Sat, 4 Jan 2003 00:40:47 +0000 (00:40 +0000)]
another FreeBSD python location change

17 years agostart using platform default locations for FreeBSD.
Hans Lambermont [Sat, 4 Jan 2003 00:35:01 +0000 (00:35 +0000)]
start using platform default locations for FreeBSD.
try not to break anything for other platforms.

17 years agoUse FreeBSD's default python location when on FreeBSD
Hans Lambermont [Sat, 4 Jan 2003 00:19:53 +0000 (00:19 +0000)]
Use FreeBSD's default python location when on FreeBSD

17 years agoStart using platform default locations of libraries that used to be in
Hans Lambermont [Fri, 3 Jan 2003 22:51:49 +0000 (22:51 +0000)]
Start using platform default locations of libraries that used to be in
lib/ and came from extern/ (which isn't in the new repository at all)

So use stuff like:

   ifeq ($(OS),freebsd)
     export NAN_OPENSSL ?= /usr
   else
     export NAN_OPENSSL ?= $(LCGDIR)/openssl
   endif

Hans

17 years agoThese updates enable the build of the gameengine
Michel Selten [Fri, 3 Jan 2003 21:36:16 +0000 (21:36 +0000)]
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

17 years agoAdded the following prototype to get rid of another warning:
Kent Mein [Fri, 3 Jan 2003 16:01:12 +0000 (16:01 +0000)]
Added the following prototype to get rid of another warning:
void pub_priv_test(char *HexPriv, char *HexPub);

Kent

17 years agoTwo small updates to fix warnings.
Kent Mein [Fri, 3 Jan 2003 15:53:46 +0000 (15:53 +0000)]
Two small updates to fix warnings.

The first is renaming fv_data to fv_data2 to get rid of a shadow warning
second is an unused var that was an extra uneeded call to fabs.

Diff included:

Kent
--
mein@cs.umn.edu

Index: BSP_CSGMeshBuilder.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_CSGMeshBuilder.cpp,v
retrieving revision 1.3
diff -u -r1.3 BSP_CSGMeshBuilder.cpp
--- BSP_CSGMeshBuilder.cpp      25 Nov 2002 09:52:48 -0000      1.3
+++ BSP_CSGMeshBuilder.cpp      3 Jan 2003 15:47:15 -0000
@@ -89,13 +89,13 @@
        }

        if (props.user_face_vertex_data_size) {
-               char * fv_data = NULL;
-               fv_data = new char[4 * props.user_face_vertex_data_size];
+               char * fv_data2 = NULL;
+               fv_data2 = new char[4 * props.user_face_vertex_data_size];

-               face.user_face_vertex_data[0] = fv_data;
-               face.user_face_vertex_data[1] = fv_data + props.user_face_vertex
_data_size;
-               face.user_face_vertex_data[2] = fv_data + 2*props.user_face_vert
ex_data_size;
-               face.user_face_vertex_data[3] = fv_data + 3*props.user_face_vert
ex_data_size;
+               face.user_face_vertex_data[0] = fv_data2;
+               face.user_face_vertex_data[1] = fv_data2 + props.user_face_verte
x_data_size;
+               face.user_face_vertex_data[2] = fv_data2 + 2*props.user_face_ver
tex_data_size;
+               face.user_face_vertex_data[3] = fv_data2 + 3*props.user_face_ver
tex_data_size;
        } else {
                face.user_face_vertex_data[0] = NULL;
                face.user_face_vertex_data[1] = NULL;
[9:47] ~/blender/intern/bsp/intern(mein@captcrab) % cvs diff BSP_MeshFragment.cp
p
Index: BSP_MeshFragment.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_MeshFragment.cpp,v
retrieving revision 1.3
diff -u -r1.3 BSP_MeshFragment.cpp
--- BSP_MeshFragment.cpp        25 Nov 2002 09:52:48 -0000      1.3
+++ BSP_MeshFragment.cpp        3 Jan 2003 15:47:21 -0000
@@ -106,8 +106,6 @@
                if (BSP_Classification(vert.OpenTag()) == e_unclassified)
                {
                        MT_Scalar sdistance = plane.signedDistance(vert.m_pos);
-                       MT_Scalar fsdistance = fabs(sdistance);
-
                        if (fabs(sdistance) <= BSP_SPLIT_EPSILON) {
                                // this vertex is on
                                vert.SetOpenTag(e_classified_on);

17 years agoAdded fix for invisible size widget on OSX.
Maarten Gribnau [Wed, 1 Jan 2003 22:32:35 +0000 (22:32 +0000)]
Added fix for invisible size widget on OSX.
It's still behind a define because it does not work with
blender (player and gears work fine).
Maarten

17 years agoAdded mouse down event when window was activated by
Maarten Gribnau [Wed, 1 Jan 2003 21:35:51 +0000 (21:35 +0000)]
Added mouse down event when window was activated by
clicking on it. The mouse up was already generated. They
are now balanced by mouse downs. The behaviour of the
OSX target now matches that of the WIN32 target.
Maarten

17 years agoFix for lots of window size events during window drag
Maarten Gribnau [Wed, 1 Jan 2003 21:31:36 +0000 (21:31 +0000)]
Fix for lots of window size events during window drag
Maarten

17 years agoEnabled event printer in debug target to trace event handling in ghost.
Maarten Gribnau [Wed, 1 Jan 2003 21:30:39 +0000 (21:30 +0000)]
Enabled event printer in debug target to trace event handling in ghost.
Maarten

17 years agoRemoved injust assertion failure when clicking on the menu bar. Debug target would...
Maarten Gribnau [Wed, 1 Jan 2003 21:20:10 +0000 (21:20 +0000)]
Removed injust assertion failure when clicking on the menu bar. Debug target would complain about an invalid window.
Maarten

17 years agoAdded test for events pending for windows already disposed. These events are removed...
Maarten Gribnau [Wed, 1 Jan 2003 20:42:27 +0000 (20:42 +0000)]
Added test for events pending for windows already disposed. These events are removed from the event stack now.
Maarten

17 years agoRemoved unused vars.
Maarten Gribnau [Wed, 1 Jan 2003 20:31:12 +0000 (20:31 +0000)]
Removed unused vars.
Maarten

17 years agoFixed ghost full-screen problem
Maarten Gribnau [Wed, 1 Jan 2003 20:23:42 +0000 (20:23 +0000)]
Fixed ghost full-screen problem
After switching back from full-screen, the active window is returned to the one active before full-screen mode was entered.
Maarten

17 years agoFixed some documentation errors
Maarten Gribnau [Wed, 1 Jan 2003 19:57:02 +0000 (19:57 +0000)]
Fixed some documentation errors
Maarten

17 years agoFinished cleaning up the ik directory removing unused files.
Kent Mein [Wed, 1 Jan 2003 18:28:31 +0000 (18:28 +0000)]
Finished cleaning up the ik directory removing unused files.

Kent
--
mein@cs.umn.edu

17 years agoI added the two patches Chris and I pointed too back in Nov.
Kent Mein [Wed, 1 Jan 2003 18:11:26 +0000 (18:11 +0000)]
I added the two patches Chris and I pointed too back in Nov.
(Adding Window Hints and giving the window input focus after it has
been raised.)

Kent
--
mein@cs.umn.edu

17 years agoRob's patches for the slow render problem.
Kent Mein [Wed, 1 Jan 2003 17:47:20 +0000 (17:47 +0000)]
Rob's patches for the slow render problem.

Kent
--
mein@cs.umn.edu

17 years agoInitial commit of 'release'.
Chris Want [Wed, 1 Jan 2003 15:11:07 +0000 (15:11 +0000)]
Initial commit of 'release'.

These 2 got files missed because the * wildcard didn't match the
'.' at the beginning of the names (%$&#*!)

Chris

17 years agoInitial commit of the 'release' directory (splash screen/icon
Chris Want [Wed, 1 Jan 2003 15:06:10 +0000 (15:06 +0000)]
Initial commit of the 'release' directory (splash screen/icon
junkies will be happy to find the datatoc.c program in the
datafiles directory).

Some quick notes:

* 'datafiles' has the version 2.21 splash.jpg and blenderbuttons (e.g., so
no NLA icon). Someone should at least get the 2.25 blenderbuttons from
somewhere and commit them.

* 'text' has obsolete content/license

* I did not include the python scripts as they have copyright
Jan Walter and no license specified.

* I changed to unix line terminators everywhere with the exeption of the
'windows' directory.

Chris

17 years agoA kludge to use the right compiler while freezing
Chris Want [Wed, 1 Jan 2003 02:07:47 +0000 (02:07 +0000)]
A kludge to use the right compiler while freezing
using gcc under Irix -- without this it uses only
'cc -n32' (since this is what the sgi employee
who compiled the python stuff used).

Chris

17 years agochanged back to char :)
Kent Mein [Tue, 31 Dec 2002 14:43:16 +0000 (14:43 +0000)]
changed back to char :)

Kent
--
mein@cs.umn.edu

17 years agoSorry about that this is part of the last update. I ment to cancel it
Kent Mein [Tue, 31 Dec 2002 11:54:33 +0000 (11:54 +0000)]
Sorry about that this is part of the last update.  I ment to cancel it
and include both files.

Anyway I was fixing the warning with ascii char...  Here is the diff for
editfont.c (the .h was just fixing the header to match it)

Kent

Index: editfont.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editfont.c,v
retrieving revision 1.3
diff -u -r1.3 editfont.c
--- editfont.c  25 Nov 2002 12:02:05 -0000      1.3
+++ editfont.c  31 Dec 2002 11:52:10 -0000
@@ -226,11 +226,12 @@
        }
 }

-void do_textedit(unsigned short event, short val, char ascii)
+void do_textedit(unsigned short event, short val, unsigned char _ascii)
 {
        Curve *cu;
        static int accentcode= 0;
        int x, doit=0, cursmove=0;
+        int ascii = _ascii;

17 years ago:q!
Kent Mein [Tue, 31 Dec 2002 11:53:03 +0000 (11:53 +0000)]
:q!

17 years agoUpdated the spacebar toolbox so the fonts are moved up 2 pixels.
Kent Mein [Mon, 30 Dec 2002 20:15:07 +0000 (20:15 +0000)]
Updated the spacebar toolbox so the fonts are moved up 2 pixels.

It was causing funky artifacts on some letters that dropped down into the
background.

Here is the diff

Kent

Index: toolbox.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/toolbox.c,v
retrieving revision 1.5
diff -u -r1.5 toolbox.c
--- toolbox.c   22 Dec 2002 13:43:21 -0000      1.5
+++ toolbox.c   30 Dec 2002 20:13:51 -0000
@@ -506,7 +506,7 @@
        oldcursor= get_cursor();
        set_cursor(CURSOR_STD);

-       tbfontyofs= (TBOXH-11)/2;       /* toolbox, hier stond ooit getheigh */
+       tbfontyofs= (TBOXH-11)/2 +2;    /* toolbox, hier stond ooit getheigh */
 }

17 years agoremoved second CVS id tags, cleaned up new lines
Maarten Gribnau [Mon, 30 Dec 2002 12:11:03 +0000 (12:11 +0000)]
removed second CVS id tags, cleaned up new lines
Maarten

17 years agosmall correction to temporary and output directory
Maarten Gribnau [Mon, 30 Dec 2002 09:25:52 +0000 (09:25 +0000)]
small correction to temporary and output directory
Maarten

17 years agorenamed a var to avoid name conflicts...
Kent Mein [Mon, 30 Dec 2002 07:15:47 +0000 (07:15 +0000)]
renamed a var to avoid name conflicts...
In the header its just this..
-void initjit(float *jit, int num)
+void initjit(float *jitarr, int num)

its respectively renamed in jitter.c

Kent

17 years agoRemoved another unused var and cleaned up a couple of lines of code
Kent Mein [Mon, 30 Dec 2002 07:13:26 +0000 (07:13 +0000)]
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)

17 years agoRemoved unused var here is the diff:
Kent Mein [Mon, 30 Dec 2002 07:09:23 +0000 (07:09 +0000)]
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)

17 years agoMade the ActiveX plug-in link and run with ode.
Maarten Gribnau [Sun, 29 Dec 2002 23:22:35 +0000 (23:22 +0000)]
Made the ActiveX plug-in link and run with ode.
Maarten

17 years agoWhile building with gcc on Irix one is confronted by the message:
Chris Want [Sun, 29 Dec 2002 15:59:51 +0000 (15:59 +0000)]
While building with gcc on Irix one is confronted by the message:

---------------------------->8----------------------------------------------
g++ -DHAVE_CONFIG_H -I. -I../../../blender/intern/bsp -I../.. -I../../../blender/intern/container -I../../../blender/intern/moto/include -I../../../blender/intern/memutil -I/usr/freeware/include -g -funsigned-char -c ../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp -MT BSP_CSGMesh.lo -MD -MP -MF .deps/BSP_CSGMesh.TPlo  -DPIC -o .libs/BSP_CSGMesh.lo
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h: In
   constructor `std::__normal_iterator<_Iterator,
   _Container>::__normal_iterator(const std::__normal_iterator<_Iter,
   _Container>&) [with _Iter = const BSP_MFace*, _Iterator = BSP_MFace*,
   _Container = std::vector<BSP_MFace, std::allocator<BSP_MFace> >]':
../../../blender/intern/bsp/intern/BSP_CSGMesh.cpp:270:   instantiated from here
/usr/freeware/lib/gcc-lib/mips-sgi-irix6.5/3.0.4/include/g++/bits/stl_iterator.h:474: cannot
   convert `const BSP_MFace* const' to `BSP_MFace*' in initialization
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
*** Error code 1 (bu21)
---------------------------->8----------------------------------------------

The line in question that causes the error is the middle one in this group:

vector<BSP_MFace>::const_iterator f_it_end = FaceSet().end();
vector<BSP_MFace>::const_iterator f_it_begin = FaceSet().begin();
vector<BSP_MFace>::iterator f_it = FaceSet().begin();

Dropping the 'const_' from that middle line enables gcc to compile the
file correctly (this is also consistent with what is going on with other
parts of the file, i.e., stuff that is returned from a begin() method is
declared as vector<BSP_MFace>::iterator instead of
vector<BSP_MFace>::const_iterator.

But I'll be honest: I have no idea what this code does, so if somebody with
better C++ skills wants to check it, then please do.

This change was also tested to compile and run on debian linux/x86
(well, booleans are broken right now, so I wasn't able to do too much
testing).

Chris

17 years agoReplaced old doxygen config file with two new ones:
Maarten Gribnau [Sat, 28 Dec 2002 22:33:48 +0000 (22:33 +0000)]
Replaced old doxygen config file with two new ones:
ghost_all.cfg to generate doxygen documentation for all of ghost.
ghost_interface.cfg to generate docs for the interface only.
Maarten

17 years agoRemoved those extra CVS tag lines in the header files of ghost (now I know what
Maarten Gribnau [Sat, 28 Dec 2002 22:26:45 +0000 (22:26 +0000)]
Removed those extra CVS tag lines in the header files of ghost (now I know what
Gilles meant) and added some extra doxygen tags I had lying around.
Removed the cocoa file since it was rubbish.
Maarten

17 years agoReverted changes to bsp code so that the code will compile
Chris Want [Sat, 28 Dec 2002 17:55:24 +0000 (17:55 +0000)]
Reverted changes to bsp code so that the code will compile
under gcc 3.x. A better solution should be found as this
breaks booleans.

Chris

17 years agoReverting change to decimation to fix compatibility with
Chris Want [Sat, 28 Dec 2002 17:45:46 +0000 (17:45 +0000)]
Reverting change to decimation to fix compatibility with
gcc 3.x (a better solution should be found)

17 years agoadded two accidentally deleted #'s (without them makesdna wouldn't work
Stefan Gartner [Fri, 27 Dec 2002 21:14:32 +0000 (21:14 +0000)]
added two accidentally deleted #'s (without them makesdna wouldn't work
properly)

sgefant

17 years agoRemoved the config.h thing from the .h's in the source dir.
Kent Mein [Fri, 27 Dec 2002 13:11:01 +0000 (13:11 +0000)]
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

17 years agoWooHoo me again ;)
Kent Mein [Thu, 26 Dec 2002 18:25:17 +0000 (18:25 +0000)]
WooHoo me again ;)
I took out the following from the includes in the intern dir that still had
it:
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif

Kent
--
mein@cs.umn.edu

17 years agoSorry, Kent the indexing changes to this file turn out to be broken
Chris Want [Wed, 25 Dec 2002 21:42:56 +0000 (21:42 +0000)]
Sorry, Kent the indexing changes to this file turn out to be broken
too -- a user reported crashing while using decimation and rolling back
the modifications between rev 1.2 and rev 1.3 for this file fixed it.

Regards,
Chris

17 years agoSome changes made to the bsp code in early November
Chris Want [Wed, 25 Dec 2002 08:35:08 +0000 (08:35 +0000)]
Some changes made to the bsp code in early November
(to stop gcc compiler warnings) caused segfaults when
performing intersections (and possibly while doing other
boolean operations). I felt it was best to revert these
changes (I also got rid of the DOS line terminators in
the files). Some more info about the matter can be found
in the first 10 or so posts for Novembor on the old
mailing list:

http://www.soze.com/mailman/private/bf-committers/2002-November/date.html

Chris (Merry Christmas!)

17 years agoAdded ode physics to blender and player targets.
Maarten Gribnau [Tue, 24 Dec 2002 12:43:56 +0000 (12:43 +0000)]
Added ode physics to blender and player targets.
ActiveX control still has a linkigng problem.
Maarten

17 years agoUpdated README with directions for Windows.
Maarten Gribnau [Sun, 22 Dec 2002 23:03:15 +0000 (23:03 +0000)]
Updated README with directions for Windows.
Maarten

17 years agoRemoved fixed path for Python excutable.
Maarten Gribnau [Sun, 22 Dec 2002 23:02:21 +0000 (23:02 +0000)]
Removed fixed path for Python excutable.
The README will explain how to set an option in MSVC to make it find
python.
Maarten

17 years agoFixed ode link path.
Maarten Gribnau [Sun, 22 Dec 2002 22:58:54 +0000 (22:58 +0000)]
Fixed ode link path.
Maarten

17 years agoFixed ActiveX control libraries and library paths.
Maarten Gribnau [Sun, 22 Dec 2002 22:42:11 +0000 (22:42 +0000)]
Fixed ActiveX control libraries and library paths.
Removed abundant frozen python files.
Maarten

17 years agoDisabled player's check for Publisher file for input.
Maarten Gribnau [Sun, 22 Dec 2002 22:02:57 +0000 (22:02 +0000)]
Disabled player's check for Publisher file for input.
Maarten

17 years agoFixed binary files stored as text files for plug-ins
Maarten Gribnau [Sun, 22 Dec 2002 22:00:55 +0000 (22:00 +0000)]
Fixed binary files stored as text files for plug-ins
Maarten

17 years agofixed a *really* minor bug where tooltips were not resetting if next
Simon Clitherow [Sun, 22 Dec 2002 13:43:21 +0000 (13:43 +0000)]
fixed a *really* minor bug where tooltips were not resetting if next
call to add_numbut() asks for a NULL tooltip. --aphex

============================================================
RCS file: /cvs01/blender/source/blender/src/toolbox.c,v
retrieving revision 1.4
diff -r1.4 toolbox.c
1356c1356,1360
<  if(tip) strcpy(numbuts[nr].tip, tip);
---
>  if(tip)
>  strcpy(numbuts[nr].tip, tip);
>  else
>  strcpy(numbuts[nr].tip, "");
>

17 years agoRewired python for OSX. The Project Builder project now uses the Python that
Maarten Gribnau [Sat, 21 Dec 2002 22:28:56 +0000 (22:28 +0000)]
Rewired python for OSX. The Project Builder project now uses the Python that
comes with OSX in /usr/local.
Removed some frozen python files that were not generated by the freeze script.
mxTextTools is still disabled because of a link error.
Maarten

17 years agoRewired python for OSX. The Makefiles now use the Python that comes with OSX
Maarten Gribnau [Sat, 21 Dec 2002 22:26:46 +0000 (22:26 +0000)]
Rewired python for OSX. The Makefiles now use the Python that comes with OSX
in /usr/local.
mxTextTools is still disabled because of a link error.
Maarten

17 years agoadded the DELKEY stuff...
Kent Mein [Sat, 21 Dec 2002 10:14:03 +0000 (10:14 +0000)]
added the DELKEY stuff...
                        else if(dev==DELKEY) {
                                if(but->pos>=0 && but->pos<strlen(str)) {
                                        for(x=but->pos; x<=strlen(str); x++)
                                                str[x]= str[x+1];
                                        str[--len]='\0';
                                        dodraw= 1;
                                }
                        }

Kent

17 years agoFix so that rgba targa files view correctly in gimp:
Kent Mein [Sat, 21 Dec 2002 09:52:03 +0000 (09:52 +0000)]
Fix so that rgba targa files view correctly in gimp:
Submitted to bf-committers by Chris Want

Kent

Index: targa.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/targa.c,v
retrieving revision 1.4
diff -u -r1.4 targa.c
--- targa.c     2002/12/20 01:29:14     1.4
+++ targa.c     2002/12/21 09:50:24
@@ -289,6 +289,12 @@

        if (flags & IB_ttob) buf[17] ^= 0x20;

+        /* Don't forget to indicate that your 32 bit
+         * targa uses 8 bits for the alpha channel! */
+        if (ibuf->depth==32) {
+           buf[17] |= 0x08;
+        }
+
        if (write(file, buf, 18) != 18) return (0);
        if (ibuf->cmap){
                for (i = 0 ; i<ibuf->maxcol ; i++){

17 years agoThis is sort of a two parter from the mailling list but really its the
Kent Mein [Fri, 20 Dec 2002 19:37:38 +0000 (19:37 +0000)]
This is sort of a two parter from the mailling list but really its the
same thing:

Added the xpcom include and added a flag to use mozilla vs netscape.
Which basically adds some ifdefs to
_Blender3DPlugin_implementation_.cpp

Basically I modified the nan_definitions.mk in the following way
(You'll need to update yours don't forget) ;)
Also updated the makefiles to use the new vars and flushed them out
so they first include whatever nspr is set to and then look in
NAN_MOZILLA_INC

I wasn't sure what the NAN_MOZILLA_INC and _LIB defaults should be
since were assuming they point to a netscape dir by default (or maybe
old mozilla???)
maybe they should be
   export NAN_MOZILLA_INC ?= $(LCGDIR)/netscape/include
   export NAN_MOZILLA_LIB ?= $(LCGDIR)/netscape/lib/

instead...

Anyone have any opinions on the defaults?

Kent
--
mein@cs.umn.edu

Index: nan_definitions.mk
===================================================================
RCS file: /cvs01/blender/source/nan_definitions.mk,v
retrieving revision 1.8
diff -u -r1.8 nan_definitions.mk
--- nan_definitions.mk  2002/12/19 21:12:58     1.8
+++ nan_definitions.mk  2002/12/20 19:28:51
@@ -75,7 +75,13 @@
     export NAN_TEST_VERBOSITY ?= 1
     export NAN_ZLIB ?= $(LCGDIR)/zlib
     export NAN_BMFONT ?= $(LCGDIR)/bmfont
-    export NAN_MOZILLA ?= $(LCGDIR)/mozilla
+    # Uncomment the following line to use Mozilla inplace of netscape
+    # CPPFLAGS +=-DMOZ_NOT_NET
+    # Location of MOZILLA/Netscape header files...
+    export NAN_MOZILLA_INC ?= $(LCGDIR)/mozilla/include
+    export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/
+    # Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB
+    # if this is not set.
     export NAN_NSPR ?= $(LCGDIR)/nspr

17 years agoShrunk the hack so it didn't get used in newer versions of OpenAL which
Kent Mein [Fri, 20 Dec 2002 19:27:39 +0000 (19:27 +0000)]
Shrunk the hack so it didn't get used in newer versions of OpenAL which
seems to be working.

Kent

(diff follows)

Index: SND_OpenALDevice.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/SoundSystem/openal/SND_OpenALDevice.cpp,v
retrieving revision 1.4
diff -u -r1.4 SND_OpenALDevice.cpp
--- SND_OpenALDevice.cpp        2002/11/25 15:29:57     1.4
+++ SND_OpenALDevice.cpp        2002/12/20 19:26:04
@@ -59,7 +59,7 @@
 #include <fcntl.h>

 /* untill openal gets unified we need this hack for non-windows systems */
-#ifndef WIN32
+#if !defined(WIN32) && !defined(ALC_MAJOR_VERSION)

17 years agoAdded a link for where to get glut
Kent Mein [Fri, 20 Dec 2002 09:52:45 +0000 (09:52 +0000)]
Added a link for where to get glut

Kent
--
mein@cs.umn.edu

17 years agoFixed up the header comment so it didn't produce a warning about
Kent Mein [Fri, 20 Dec 2002 09:41:25 +0000 (09:41 +0000)]
Fixed up the header comment so it didn't produce a warning about
comment inside of a comment

Also removed the config.h thing since this is a .h

Hopefully I'll get around to the other .h's soon.

Kent
--
mein@cs.umn.edu

17 years agoBack at it ;)
Kent Mein [Fri, 20 Dec 2002 09:39:02 +0000 (09:39 +0000)]
Back at it ;)

Removed an unused var...
Here is the cvs diff.

Kent

Index: bsp/intern/BSP_CSGUserData.cpp
===================================================================
RCS file: /cvs01/blender/intern/bsp/intern/BSP_CSGUserData.cpp,v
retrieving revision 1.4
diff -u -r1.4 BSP_CSGUserData.cpp
--- BSP_CSGUserData.cpp 2002/11/25 09:52:48     1.4
+++ BSP_CSGUserData.cpp 2002/12/20 09:37:58
@@ -79,7 +79,6 @@
        int record_index
 ){
        if (m_width) {
-               int output = Size();
                IncSize();

17 years agoOk last change for the night :)
Kent Mein [Fri, 20 Dec 2002 02:52:58 +0000 (02:52 +0000)]
Ok last change for the night :)
Time to go watch er.

Note this was already done with face_old, img_old was probably just
overlooked.
(If you guys didn't notice I was sick for a couple of days but I'm back now
as you can tell)

Kent
--
mein@cs.umn.edu

Index: editface.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editface.c,v
retrieving revision 1.3
diff -u -r1.3 editface.c
--- editface.c  2002/11/25 12:02:05     1.3
+++ editface.c  2002/12/20 02:50:55
@@ -1202,7 +1202,7 @@
        TFace *face, *face_old = 0;
        short xy[2], xy_old[2];
        //int a, index;
-       Image *img, *img_old;
+       Image *img, *img_old = 0;

17 years agoIn stubs.c I added a dummy return to functions that were non void types.
Kent Mein [Fri, 20 Dec 2002 02:08:46 +0000 (02:08 +0000)]
In stubs.c I added a dummy return to functions that were non void types.

in readfile.c I renamed some localvars that were named main to mainl in
a couple of functions.

in action.c I initalized a var to 0.  This is probably not needed but
its a little safer incase someone adds more modes...
I've included a diff of this last one below.

Kent

Index: action.c
===================================================================
RCS file: /cvs01/blender/source/blender/blenkernel/intern/action.c,v
retrieving revision 1.6
diff -u -r1.6 action.c
--- action.c    2002/11/25 12:01:52     1.6
+++ action.c    2002/12/20 02:06:27
@@ -153,7 +153,7 @@
 ){
        bConstraint *dcon;
        const bConstraint *scon;
-       float dstweight;
+       float dstweight = 0;

        switch (mode){
        case POSE_BLEND:

17 years agoTwo more variables that were not initalized.
Kent Mein [Fri, 20 Dec 2002 01:29:14 +0000 (01:29 +0000)]
Two more variables that were not initalized.

cvs diff included below.

Kent
--
mein@cs.umn.edu

Index: png_encode.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/png_encode.c,v
retrieving revision 1.3
diff -u -r1.3 png_encode.c
--- png_encode.c        2002/11/25 12:02:00     1.3
+++ png_encode.c        2002/12/20 01:28:18
@@ -91,7 +91,7 @@
        unsigned char *pixels = 0;
        unsigned char *from, *to;
        png_bytepp row_pointers = 0;
-       int i, bytesperpixel, color_type;
+       int i, bytesperpixel, color_type = PNG_COLOR_TYPE_GRAY;
        FILE *fp = 0;

Index: targa.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/targa.c,v
retrieving revision 1.3
diff -u -r1.3 targa.c
--- targa.c     2002/11/25 12:02:00     1.3
+++ targa.c     2002/12/20 01:28:20
@@ -247,7 +247,7 @@
        char buf[20];
        FILE *fildes;
        int i;
-       short ok;
+       short ok = 0;

17 years agoOk since no one cares about this I put a 5 second fix on it and won't
Kent Mein [Fri, 20 Dec 2002 01:14:46 +0000 (01:14 +0000)]
Ok since no one cares about this I put a 5 second fix on it and won't
worry about it anymore :)

(initalized it to 0 and then later return 0 if its still 0 before doing
the work)

Kent
--
mein@cs.umn.edu

17 years agoFixed two uninitalized vars:
Kent Mein [Thu, 19 Dec 2002 22:13:37 +0000 (22:13 +0000)]
Fixed two uninitalized vars:

Kent

 /cvs01/blender/source/blender/imbuf/intern/iris.c,v
retrieving revision 1.3
diff -u -r1.3 iris.c
--- iris.c      2002/11/25 12:02:00     1.3
+++ iris.c      2002/12/19 22:12:53
@@ -212,7 +212,7 @@
 /*  unsigned int *tab; */
 /*  int len; */
 {
-       int r;
+       int r = 0;

        while(len) {
                r = putlong(outf,*tab++);
@@ -548,7 +548,7 @@
 {
        FILE *outf;
        IMAGE *image;
-       int tablen, y, z, pos, len;
+       int tablen, y, z, pos, len = 0;
        int *starttab, *lengthtab;
        unsigned char *rlebuf;

17 years agoAdded the the magic compiler flag that will turn on game-engine integration with...
Maarten Gribnau [Thu, 19 Dec 2002 22:06:32 +0000 (22:06 +0000)]
Added the the magic compiler flag that will turn on game-engine integration with Blender. The line is commented by default as was discussed on the list.
Maarten

17 years agoI initalized mask to 0 in IMB_converttocmap
Kent Mein [Thu, 19 Dec 2002 21:26:34 +0000 (21:26 +0000)]
I initalized mask to 0 in IMB_converttocmap

This may not be correct but at least now its predictable.

Kent

17 years agoUsed NAN_ODE to point to the ode lib location.
Maarten Gribnau [Thu, 19 Dec 2002 21:14:18 +0000 (21:14 +0000)]
Used NAN_ODE to point to the ode lib location.
Maarten

17 years agoOverrided NAN_ODE in OSX to point to the precompiled ode lib in the lib tree.
Maarten Gribnau [Thu, 19 Dec 2002 21:12:58 +0000 (21:12 +0000)]
Overrided NAN_ODE in OSX to point to the precompiled ode lib in the lib tree.
Maarten

17 years ago-static void SleepTillEvent(Display *display, GHOST_TUns64 maxSleep) {
Kent Mein [Thu, 19 Dec 2002 20:08:12 +0000 (20:08 +0000)]
-static void SleepTillEvent(Display *display, GHOST_TUns64 maxSleep) {
+static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) {

maxSleep is checked against -1 so it needs to have a sign.
This could even fix some stability problems since -1 is passed in sometimes
in the code.

Kent
--
mein@cs.umn.edu

17 years agoFixed this warning:
Kent Mein [Thu, 19 Dec 2002 20:06:07 +0000 (20:06 +0000)]
Fixed this warning:

IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment(MT_Point3,
   MT_Matrix3x3, double, MT_ExpMap)':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
   IK_QSegment::m_length'
IK_QSegment.h:270: warning:   and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:56: warning:   will be re-ordered to match declaration order
IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment()':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
   IK_QSegment::m_length'
IK_QSegment.h:270: warning:   and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:73: warning:   will be re-ordered to match declaration order

Kind of goofy its just the order of which 2 private vars are defined.

Kent
--
mein@cs.umn.edu

17 years agoUpdated the readme section on building OSX.
Maarten Gribnau [Mon, 16 Dec 2002 22:43:27 +0000 (22:43 +0000)]
Updated the readme section on building OSX.
Not sure whether this should also go in the xml file in the doc directory.
If so, what editor should I use?
Maarten

17 years agoRemoved Ode build from OSX target.
Maarten Gribnau [Mon, 16 Dec 2002 22:31:50 +0000 (22:31 +0000)]
Removed Ode build from OSX target.
This is now replaced by the Ode lib in CVS.
Maarten