| Age | Commit message (Collapse) | Author |
|---|
|
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);
|
|
It's still behind a define because it does not work with
blender (player and gears work fine).
Maarten
|
|
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
|
|
Maarten
|
|
Maarten
|
|
would complain about an invalid window.
Maarten
|
|
removed from the event stack now.
Maarten
|
|
Maarten
|
|
After switching back from full-screen, the active window is returned to the one active before full-screen mode was entered.
Maarten
|
|
Maarten
|
|
Kent
--
mein@cs.umn.edu
|
|
(Adding Window Hints and giving the window input focus after it has
been raised.)
Kent
--
mein@cs.umn.edu
|
|
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
|
|
Maarten
|
|
Maarten
|
|
---------------------------->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
|
|
ghost_all.cfg to generate doxygen documentation for all of ghost.
ghost_interface.cfg to generate docs for the interface only.
Maarten
|
|
Gilles meant) and added some extra doxygen tags I had lying around.
Removed the cocoa file since it was rubbish.
Maarten
|
|
under gcc 3.x. A better solution should be found as this
breaks booleans.
Chris
|
|
gcc 3.x (a better solution should be found)
|
|
So we should be all set now :)
Kent
--
mein@cs.umn.edu
|
|
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
|
|
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
|
|
(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!)
|
|
The README will explain how to set an option in MSVC to make it find
python.
Maarten
|
|
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)
|
|
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();
|
|
+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
|
|
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
|
|
Kent
--
mein@cs.umn.edu
|
|
(-l/usr/openwin/lib -lglut etc...)
Kent
--
mein@cs.umn.edu
|
|
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
|
|
Kent
--
mein@cs.umn.edu
|
|
Previous commit broke this. --aphex
|
|
|
|
Win9x/ME-friendly.
This shouldn't break the NT/2000/XP builds, but let me know if it does!
--aphex
|
|
(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
|
|
(removed them from cvs and from the Makefile.am)
Kent
--
mein@cs.umn.edu
|
|
#include <stdlib.h>
To fix a problem with a machine not being able to find malloc
Kent
|
|
Maarten
|
|
This allowed me to get Python working in Blender.
Maarten
|
|
|
|
|
|
makemakefile.py reverted for sake of original build system. Makefile.am modified accordingly.
|
|
Kent
--
mein@cs.umn.edu
|
|
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
added to these files.
Kent
--
mein@cs.umn.edu
|
|
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Just need to finish cpp files now :)
Kent
--
mein@cs.umn.edu
|
|
(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
|
|
added the following 3 lines to everything in the intern dir:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Kent
--
mein@cs.umn.edu
|
|
Kent
--
mein@cs.umn.edu
|
