Commit Graph

88 Commits

Author SHA1 Message Date
c95d631b83 Removed references to modules that do not exist. The python interface is
broken, but it should give 0 errors when building.

Michel
2003-01-06 17:27:43 +00:00
fa45a02295 on Mac OS X run ranlib on libfrozen.a after creating it 2003-01-06 17:22:57 +00:00
3290b8c1c0 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
2003-01-04 21:58:04 +00:00
8dcdf3bf0b - replaced #elif with more correct version:
< #elif _WIN32
---
> #elif defined(_WIN32)
2003-01-04 18:17:50 +00:00
f92d4b8650 libfrozen will be built only once until one of the python files is changed.
Michel
2003-01-04 17:31:11 +00:00
38e5b5899c - on windows alcGetError() has no arguments. On other platforms it does. 2003-01-04 16:46:49 +00:00
76f4ae72f3 - 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.
2003-01-04 16:27:26 +00:00
Hans Lambermont
45b243ac47 Workaround for the header file copying dependency hell 2003-01-04 15:07:25 +00:00
1af0e07f74 Added the following prototype to get rid of another warning:
void pub_priv_test(char *HexPriv, char *HexPub);

Kent
2003-01-03 16:01:12 +00:00
f2aaeb8f5b 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);
2003-01-03 15:53:46 +00:00
fac23acffe 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
2003-01-01 22:32:35 +00:00
e3376a4338 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
2003-01-01 21:35:51 +00:00
581b3139b1 Fix for lots of window size events during window drag
Maarten
2003-01-01 21:31:36 +00:00
490b6469f2 Enabled event printer in debug target to trace event handling in ghost.
Maarten
2003-01-01 21:30:39 +00:00
6cafc69ef6 Removed injust assertion failure when clicking on the menu bar. Debug target would complain about an invalid window.
Maarten
2003-01-01 21:20:10 +00:00
729281a021 Added test for events pending for windows already disposed. These events are removed from the event stack now.
Maarten
2003-01-01 20:42:27 +00:00
c78a1749ed Removed unused vars.
Maarten
2003-01-01 20:31:12 +00:00
065f294aa1 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
2003-01-01 20:23:42 +00:00
570b0462e2 Fixed some documentation errors
Maarten
2003-01-01 19:57:02 +00:00
077fd2d1de Finished cleaning up the ik directory removing unused files.
Kent
--
mein@cs.umn.edu
2003-01-01 18:28:31 +00:00
26aa841a1f 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
2003-01-01 18:11:26 +00:00
Chris Want
d52deb4397 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
2003-01-01 02:07:47 +00:00
82a1469e4b removed second CVS id tags, cleaned up new lines
Maarten
2002-12-30 12:11:03 +00:00
438ffa7e1d small correction to temporary and output directory
Maarten
2002-12-30 09:25:52 +00:00
Chris Want
9c18b6cff7 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
2002-12-29 15:59:51 +00:00
f0d39af87b 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
2002-12-28 22:33:48 +00:00
b2824fe23a 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
2002-12-28 22:26:45 +00:00
Chris Want
9e3c814e72 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
2002-12-28 17:55:24 +00:00
Chris Want
7c96971152 Reverting change to decimation to fix compatibility with
gcc 3.x (a better solution should be found)
2002-12-28 17:45:46 +00:00
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
f78de74b20 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
2002-12-26 18:25:17 +00:00
Chris Want
331fffaecb 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
2002-12-25 21:42:56 +00:00
Chris Want
f8b3f65d85 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!)
2002-12-25 08:35:08 +00:00
a609ff51e8 Removed fixed path for Python excutable.
The README will explain how to set an option in MSVC to make it find
python.
Maarten
2002-12-22 23:02:21 +00:00
e5341714b6 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)
2002-12-20 19:27:39 +00:00
782a5b573d 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();
2002-12-20 09:39:02 +00:00
45c360dfc4 -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
2002-12-19 20:08:12 +00:00
d9df4b8feb 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
2002-12-19 20:06:07 +00:00
8b9b761e97 Created a Makefile and got it actually to compile :)
Kent
--
mein@cs.umn.edu
2002-12-16 12:02:24 +00:00
cca22768dc Added extra libs for solaris
(-l/usr/openwin/lib -lglut etc...)

Kent
--
mein@cs.umn.edu
2002-12-16 11:18:31 +00:00
a5b42eb626 Fixed the files so they compile...
Had to add an argument to Create_window... (it was missing the sterio flag)

Also cleaned up some variable overloading warnings...
(i.e. window shadows previous def)

Kent
2002-12-16 10:57:08 +00:00
4a9377a861 Gilles's patch to get rid of the the same identifier warnings
Kent
--
mein@cs.umn.edu
2002-12-14 15:38:45 +00:00
cfceb16f4a Corrected intern lib names so blendercreator.dsp can find them.
Previous commit broke this. --aphex
2002-12-14 12:31:17 +00:00
0c1e935175 And the rest! ;) --aphex 2002-12-12 21:16:46 +00:00
12a587bd58 Modified the intern MSVC project files to make them more
Win9x/ME-friendly.

This shouldn't break the NT/2000/XP builds, but let me know if it does!

--aphex
2002-12-12 21:13:47 +00:00
cd4a60f536 sgefants patch to remove the License Key stuff.
(I noticed its not completely gone yet from the blender/source dir)
But its a big step in the right direction if it doesn't enable
all of the functionatlity already...

(Using cscope for LICENSE_KEY_VALID still turns up some stuff)

Kent
--
mein@cs.umn.edu
2002-12-06 19:48:37 +00:00
671a355e9f Got rid of unused files in intern/iksolver
(removed them from cvs and from the Makefile.am)

Kent
--
mein@cs.umn.edu
2002-12-03 12:11:07 +00:00
644e4d7c1c I added
#include <stdlib.h>
To fix a problem with a machine not being able to find malloc

Kent
2002-12-02 09:48:10 +00:00
3ee75a90d2 These freeze changes give working frozen Python code on Windows.
Maarten
2002-12-01 22:58:29 +00:00
d48f993c55 Removed non-existing Tools from the Blender module.
This allowed me to get Python working in Blender.
Maarten
2002-12-01 21:24:45 +00:00