[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14676] branches/fluidcontrol: svn merge -r 14627:14649 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Daniel Genrich daniel.genrich at gmx.net
Sun May 4 16:10:11 CEST 2008


Revision: 14676
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14676
Author:   genscher
Date:     2008-05-04 16:10:11 +0200 (Sun, 04 May 2008)

Log Message:
-----------
svn merge -r 14627:14649 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/fluidcontrol/CMakeLists.txt
    branches/fluidcontrol/SConstruct
    branches/fluidcontrol/config/win32-vc-config.py
    branches/fluidcontrol/extern/verse/dist/v_bignum.c
    branches/fluidcontrol/release/scripts/x3d_export.py
    branches/fluidcontrol/source/blender/python/api2_2x/Library.c
    branches/fluidcontrol/source/blender/python/api2_2x/Library.h
    branches/fluidcontrol/source/blender/python/api2_2x/doc/LibData.py
    branches/fluidcontrol/source/blender/src/buttons_editing.c
    branches/fluidcontrol/source/blender/src/buttons_object.c
    branches/fluidcontrol/source/blender/src/drawobject.c
    branches/fluidcontrol/source/blender/src/drawview.c
    branches/fluidcontrol/source/blender/src/editcurve.c
    branches/fluidcontrol/source/blender/src/editdeform.c
    branches/fluidcontrol/source/blender/src/editscreen.c
    branches/fluidcontrol/source/blender/src/space.c
    branches/fluidcontrol/source/blender/src/view.c
    branches/fluidcontrol/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/fluidcontrol/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/fluidcontrol/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/fluidcontrol/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.h
    branches/fluidcontrol/source/gameengine/Ketsji/KX_Scene.cpp
    branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/fluidcontrol/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp

Modified: branches/fluidcontrol/CMakeLists.txt
===================================================================
--- branches/fluidcontrol/CMakeLists.txt	2008-05-04 11:09:30 UTC (rev 14675)
+++ branches/fluidcontrol/CMakeLists.txt	2008-05-04 14:10:11 UTC (rev 14676)
@@ -250,6 +250,10 @@
   ELSE (MSVC80)
   SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
   ENDIF(MSVC80)
+  IF (MSVC90)
+  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+  ENDIF(MSVC90)
+
   
   SET(QUICKTIME ${LIBDIR}/QTDevWin)
   SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)

Modified: branches/fluidcontrol/SConstruct
===================================================================
--- branches/fluidcontrol/SConstruct	2008-05-04 11:09:30 UTC (rev 14675)
+++ branches/fluidcontrol/SConstruct	2008-05-04 14:10:11 UTC (rev 14676)
@@ -398,9 +398,26 @@
     if '.svn' in tn:
         tn.remove('.svn')
     for f in tf:
+        print ">>>", env['BF_INSTALLDIR'], tp, f
         pluglist.append(tp+os.sep+f)
         plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
 
+# header files for plugins
+pluglist.append('source/blender/blenpluginapi/documentation.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'documentation.h')
+pluglist.append('source/blender/blenpluginapi/externdef.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'externdef.h')
+pluglist.append('source/blender/blenpluginapi/floatpatch.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'floatpatch.h')
+pluglist.append('source/blender/blenpluginapi/iff.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'iff.h')
+pluglist.append('source/blender/blenpluginapi/plugin.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h')
+pluglist.append('source/blender/blenpluginapi/util.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h')
+pluglist.append('source/blender/blenpluginapi/plugin.DEF')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def')
+
 plugininstall = []
 for targetdir,srcfile in zip(plugtargetlist, pluglist):
     td, tf = os.path.split(targetdir)

Modified: branches/fluidcontrol/config/win32-vc-config.py
===================================================================
--- branches/fluidcontrol/config/win32-vc-config.py	2008-05-04 11:09:30 UTC (rev 14675)
+++ branches/fluidcontrol/config/win32-vc-config.py	2008-05-04 14:10:11 UTC (rev 14676)
@@ -170,7 +170,6 @@
                         /NODEFAULTLIB:"libcd.lib"
                         /NODEFAULTLIB:"libcpd.lib" 
                         /NODEFAULTLIB:"libcp.lib" 
-                        /NODEFAULTLIB:"libcmtd.lib"
                     '''
                         
 BF_BUILDDIR = '..\\build\\win32-vc'

Modified: branches/fluidcontrol/extern/verse/dist/v_bignum.c
===================================================================
--- branches/fluidcontrol/extern/verse/dist/v_bignum.c	2008-05-04 11:09:30 UTC (rev 14675)
+++ branches/fluidcontrol/extern/verse/dist/v_bignum.c	2008-05-04 14:10:11 UTC (rev 14676)
@@ -768,7 +768,7 @@
 		for(j = i + 1; j < t; j++)
 		{
 /*			printf("computing uv=%X+2*%X*%X+%X\n", w[i + j], x[1 + j], x[1 + i], c);*/
-			uv = x[1 + j] * x[1 + i];
+			uv = ((VBigDigs)x[1 + j]) * ((VBigDigs)x[1 + i]);
 			high = (uv & 0x80000000) != 0;
 			uv *= 2;
 			ouv = uv;	/* Addition below might wrap and generate high bit. */

Modified: branches/fluidcontrol/release/scripts/x3d_export.py
===================================================================
--- branches/fluidcontrol/release/scripts/x3d_export.py	2008-05-04 11:09:30 UTC (rev 14675)
+++ branches/fluidcontrol/release/scripts/x3d_export.py	2008-05-04 14:10:11 UTC (rev 14676)
@@ -1,15 +1,12 @@
 #!BPY
 """ Registration info for Blender menus:
 Name: 'X3D Extensible 3D (.x3d)...'
-Blender: 235
+Blender: 245
 Group: 'Export'
-Submenu: 'All Objects...' all
-Submenu: 'All Objects compressed...' comp
-Submenu: 'Selected Objects...' selected
-Tooltip: 'Export to Extensible 3D file (.x3d)'
+Tooltip: 'Export selection to Extensible 3D file (.x3d)'
 """
 
-__author__ = ("Bart")
+__author__ = ("Bart", "Campbell Barton")
 __email__ = ["Bart, bart:neeneenee*de"]
 __url__ = ["Author's (Bart) homepage, http://www.neeneenee.de/vrml"]
 __version__ = "2006/01/17"
@@ -22,10 +19,9 @@
 want to export only selected or all relevant objects.
 
 Known issues:<br>
-    Doesn't handle multiple materials (don't use material indices);<br>
-    Doesn't handle multiple UV textures on a single mesh (create a mesh
-for each texture);<br>
-    Can't get the texture array associated with material * not the UV ones;
+	Doesn't handle multiple materials (don't use material indices);<br>
+	Doesn't handle multiple UV textures on a single mesh (create a mesh for each texture);<br>
+	Can't get the texture array associated with material * not the UV ones;
 """
 
 
@@ -58,953 +54,903 @@
 ####################################
 
 import Blender
-from Blender import Object, NMesh, Lamp, Draw, Image, Text, sys
+from Blender import Object, Lamp, Draw, Image, Text, sys, Mesh
 from Blender.Scene import Render
 import math
 
+# 
+DEG2RAD=0.017453292519943295
+MATWORLD= Blender.Mathutils.RotationMatrix(-90, 4, 'x')
+
 ####################################
 # Global Variables
 ####################################
 
-scene = Blender.Scene.GetCurrent()
-world = Blender.World.GetCurrent() 
-worldmat = Blender.Texture.Get()
 filename = Blender.Get('filename')
 _safeOverwrite = True
 ARG=''
 extension = ''
 
-class DrawTypes:
-    """Object DrawTypes enum values
-    BOUNDS - draw only the bounding box of the object
-    WIRE - draw object as a wire frame
-    SOLID - draw object with flat shading
-    SHADED - draw object with OpenGL shading
-"""
-    BOUNDBOX  = 1
-    WIRE      = 2
-    SOLID     = 3
-    SHADED    = 4
-    TEXTURE   = 5
-
-if not hasattr(Blender.Object,'DrawTypes'):
-    Blender.Object.DrawTypes = DrawTypes()
-
 ##########################################################
 # Functions for writing output file
 ##########################################################
 
 class VRML2Export:
 
-    def __init__(self, filename):
-        #--- public you can change these ---
-        self.writingcolor = 0
-        self.writingtexture = 0
-        self.writingcoords = 0
-        self.wire = 0
-        self.proto = 1
-        self.matonly = 0
-        self.share = 0
-        self.billnode = 0
-        self.halonode = 0
-        self.collnode = 0
-        self.tilenode = 0
-        self.verbose=2     # level of verbosity in console 0-none, 1-some, 2-most
-        self.cp=3          # decimals for material color values     0.000 - 1.000
-        self.vp=3          # decimals for vertex coordinate values  0.000 - n.000
-        self.tp=3          # decimals for texture coordinate values 0.000 - 1.000
-        self.it=3
-        
-        #--- class private don't touch ---
-        self.texNames={}   # dictionary of textureNames
-        self.matNames={}   # dictionary of materiaNames
-        self.meshNames={}   # dictionary of meshNames
-        self.indentLevel=0 # keeps track of current indenting
-        self.filename=filename
-        self.file = open(filename, "w")
-        self.bNav=0
-        self.nodeID=0
-        self.namesReserved=[ "Anchor","Appearance","Arc2D","ArcClose2D","AudioClip","Background","Billboard",
-                             "BooleanFilter","BooleanSequencer","BooleanToggle","BooleanTrigger","Box","Circle2D",
-                             "Collision","Color","ColorInterpolator","ColorRGBA","component","Cone","connect",
-                             "Contour2D","ContourPolyline2D","Coordinate","CoordinateDouble","CoordinateInterpolator",
-                             "CoordinateInterpolator2D","Cylinder","CylinderSensor","DirectionalLight","Disk2D",
-                             "ElevationGrid","EspduTransform","EXPORT","ExternProtoDeclare","Extrusion","field",
-                             "fieldValue","FillProperties","Fog","FontStyle","GeoCoordinate","GeoElevationGrid",
-                             "GeoLocationLocation","GeoLOD","GeoMetadata","GeoOrigin","GeoPositionInterpolator",
-                             "GeoTouchSensor","GeoViewpoint","Group","HAnimDisplacer","HAnimHumanoid","HAnimJoint",
-                             "HAnimSegment","HAnimSite","head","ImageTexture","IMPORT","IndexedFaceSet",
-                             "IndexedLineSet","IndexedTriangleFanSet","IndexedTriangleSet","IndexedTriangleStripSet",
-                             "Inline","IntegerSequencer","IntegerTrigger","IS","KeySensor","LineProperties","LineSet",
-                             "LoadSensor","LOD","Material","meta","MetadataDouble","MetadataFloat","MetadataInteger",
-                             "MetadataSet","MetadataString","MovieTexture","MultiTexture","MultiTextureCoordinate",
-                             "MultiTextureTransform","NavigationInfo","Normal","NormalInterpolator","NurbsCurve",
-                             "NurbsCurve2D","NurbsOrientationInterpolator","NurbsPatchSurface",
-                             "NurbsPositionInterpolator","NurbsSet","NurbsSurfaceInterpolator","NurbsSweptSurface",
-                             "NurbsSwungSurface","NurbsTextureCoordinate","NurbsTrimmedSurface","OrientationInterpolator",
-                             "PixelTexture","PlaneSensor","PointLight","PointSet","Polyline2D","Polypoint2D",
-                             "PositionInterpolator","PositionInterpolator2D","ProtoBody","ProtoDeclare","ProtoInstance",
-                             "ProtoInterface","ProximitySensor","ReceiverPdu","Rectangle2D","ROUTE","ScalarInterpolator",
-                             "Scene","Script","Shape","SignalPdu","Sound","Sphere","SphereSensor","SpotLight","StaticGroup",
-                             "StringSensor","Switch","Text","TextureBackground","TextureCoordinate","TextureCoordinateGenerator",
-                             "TextureTransform","TimeSensor","TimeTrigger","TouchSensor","Transform","TransmitterPdu",
-                             "TriangleFanSet","TriangleSet","TriangleSet2D","TriangleStripSet","Viewpoint","VisibilitySensor",

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list