Commit Graph

106 Commits

Author SHA1 Message Date
Michel Selten
d45c5706d7 This small update should fix the build errors in python/freeze.
I added a check if the output directory (../frozen) exists and will create
the directory if it does not exist.
This time I tested it also with the NaN make environment :)

Michel
2003-02-01 12:01:41 +00:00
Michel Selten
dd8f2d4ee3 Now the make freeze is done when any of the *.py files in intern/python
is updated.
* modulefinder creates a file src.list which contains all the *.py files
  needed for the python suport in Blender.
* Makefile.am is able to depend on the files listed in src.list.
* makemakefile_ac.py is reverted to the previous version. The old version
  contained my first attempt to get the make freeze trick working. It was
  wrong.

Michel
2003-01-31 20:24:18 +00:00
Kent Mein
c6b5dbbf9b Added multitest to the targets that get built for tests for ghost.
Kent
2003-01-30 02:47:29 +00:00
Chris Want
2d9d906cb3 Ignore WM_DELETE_WINDOW on IRIX (somebody smarter than me please
check this for correctness).
2003-01-29 19:49:22 +00:00
Chris Want
a6e4b7bb18 Mousewheel under X11 (patch by Martin Vollrathson) 2003-01-29 04:45:13 +00:00
Simon Clitherow
1bbd7b1392 Modified MSVC intern projectfiles - XCOPY doesn't need the /E option.
Updated README to suit the new 'merged' blender target.

--aphex
2003-01-28 19:39:06 +00:00
Maarten Gribnau
0df2cdbc2d Fixed constructor of wheel event.
Limited wheel event ticks to plus and minus one on Mac.
Maarten
PS Any volunteers for X11?
2003-01-27 22:08:51 +00:00
Maarten Gribnau
08c376d54c Added GHOST_WheelEvent.h
Maarten
2003-01-27 21:36:07 +00:00
Maarten Gribnau
6478b3aa94 Added mouse wheel support for windows.
Both gears (C and C++) projects contain an example.
Maarten
2003-01-27 21:35:26 +00:00
Frank van Beek
0853bef1e2 - files are now compiled in a different location. So the include path
to Python.h had to be adjusted
2003-01-26 13:12:29 +00:00
Wouter van Heyst
3bf8d2aa0c Get the Blender module back using the traditional makefiles, other
build systems (auto, msvc, PB) do not seem to have this problem.

- Change intern/python/freeze/Makefile to freeze outside of the source/ tree
- Change source/blender/bpython/Makefile to not build the frozen stuff anymore
- Change source/blender/bpython/intern/Makefile to use CURRENT_PYTHON_API
   instead of FUTURE_PYTHON_API, damage control
2003-01-26 02:42:22 +00:00
Kent Mein
d1ca120fb8 Fixed up the code so it compiles. (Basically added one more arg to
GHOST_CreateWindow)

Kent
2003-01-24 06:00:38 +00:00
Kent Mein
16677d1f28 fixed 3 warnings...
One uninitalized var and 2 unused vars.

Kent
2003-01-24 05:52:25 +00:00
Kent Mein
ffef850589 Fixed doxygen so it would run again for ghost....
My first time using it so I may have done it wrong but it produces the
docs now and it didn't before so maybe someone else wants to look at it ;)

Kent
2003-01-24 05:32:14 +00:00
Maarten Gribnau
5b845badef First light of mouse wheel support.
Only working (soso) on osx.
Maarten
2003-01-23 21:39:29 +00:00
Kent Mein
3bdb9b7f39 This commit may need to be reversed, for some of the older compilers but
I'm guessing its safe.

Basically it fixes a warning about typedef usage.
Reading the docs on gcc-3.2 it says that classes that use a typedef
need to have the keyword "typename" infront of them according to the c++
standard.  Currently it only produces a warning but it may be an
error later, so I figured why not fix it.

Kent
2003-01-21 18:31:50 +00:00
Maarten Gribnau
3ef0209f80 fixed the missing copy of the header file
Maarten
2003-01-15 14:51:23 +00:00
Francis Laurence
c6a905f7e9 Hello,
*Fixed boolean buglet in the bsp lib. I have not committed any libraries so you'll
have to do this to see the changes in blender.
*Got the bsp test program working again with the new GHOST createWindow
interface.
*(Visual C++) Modfied some of the dsp in the intern library to NOT prompt when
overwirting old libs and header files. This is the /Y option after XCOPY
Cheers
Laurence.
2003-01-12 19:48:53 +00:00
Michel Selten
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
Stefan Gartner
fa45a02295 on Mac OS X run ranlib on libfrozen.a after creating it 2003-01-06 17:22:57 +00:00
Stefan Gartner
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
Frank van Beek
8dcdf3bf0b - replaced #elif with more correct version:
< #elif _WIN32
---
> #elif defined(_WIN32)
2003-01-04 18:17:50 +00:00
Michel Selten
f92d4b8650 libfrozen will be built only once until one of the python files is changed.
Michel
2003-01-04 17:31:11 +00:00
Frank van Beek
38e5b5899c - on windows alcGetError() has no arguments. On other platforms it does. 2003-01-04 16:46:49 +00:00
Frank van Beek
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
Kent Mein
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
Kent Mein
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
Maarten Gribnau
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
Maarten Gribnau
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
Maarten Gribnau
581b3139b1 Fix for lots of window size events during window drag
Maarten
2003-01-01 21:31:36 +00:00
Maarten Gribnau
490b6469f2 Enabled event printer in debug target to trace event handling in ghost.
Maarten
2003-01-01 21:30:39 +00:00
Maarten Gribnau
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
Maarten Gribnau
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
Maarten Gribnau
c78a1749ed Removed unused vars.
Maarten
2003-01-01 20:31:12 +00:00
Maarten Gribnau
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
Maarten Gribnau
570b0462e2 Fixed some documentation errors
Maarten
2003-01-01 19:57:02 +00:00
Kent Mein
077fd2d1de Finished cleaning up the ik directory removing unused files.
Kent
--
mein@cs.umn.edu
2003-01-01 18:28:31 +00:00
Kent Mein
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
Maarten Gribnau
82a1469e4b removed second CVS id tags, cleaned up new lines
Maarten
2002-12-30 12:11:03 +00:00
Maarten Gribnau
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
Maarten Gribnau
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
Maarten Gribnau
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
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
Kent Mein
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