Age | Commit message (Collapse) | Author |
|
*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.
|
|
|
|
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);
|
|
---------------------------->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
|
|
under gcc 3.x. A better solution should be found as this
breaks booleans.
Chris
|
|
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
|
|
(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!)
|
|
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();
|
|
|
|
added the following 3 lines to everything in the intern dir:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Kent
--
mein@cs.umn.edu
|
|
intern/make/msvc_6_0. Changed paths in all these files to build to
lib/windows and use obj/window/intern for object files and other temporary
stuff.
Added project files for guardedalloc and blenkey (in keymaker directory).
blenkey still assumes openssl being installed in lib/windows.
The only thing not automated is is the frozen Python stuff.
Maarten
|
|
OSX only.
This saves other OSX developers the trouble of manually running ranlib.
This is not a good solution (because I don't know the correct one) but it works.
Maarten
|
|
to &mesh->FaceSet()[0];
mein@cs.umn.edu
|
|
to these two files.
Basically change edge_set.begin() to &edge_set[0] etc...
mein@cs.umn.edu
|
|
little minor spacing issues.
|
|
|