[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19959] branches/ge_dev: svn merge -r 19894:19958 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Benoit Bolsee benoit.bolsee at online.be
Tue Apr 28 16:07:35 CEST 2009


Revision: 19959
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19959
Author:   ben2610
Date:     2009-04-28 16:07:35 +0200 (Tue, 28 Apr 2009)

Log Message:
-----------
svn merge -r 19894:19958 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/ge_dev/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/ge_dev/release/scripts/bpymodules/paths_svg2obj.py
    branches/ge_dev/release/scripts/colladaExport14.py
    branches/ge_dev/release/scripts/colladaImport14.py
    branches/ge_dev/release/scripts/console.py
    branches/ge_dev/release/scripts/lightwave_export.py
    branches/ge_dev/release/scripts/md2_export.py
    branches/ge_dev/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_dev/source/blender/blenkernel/intern/bullet.c
    branches/ge_dev/source/blender/blenkernel/intern/modifier.c
    branches/ge_dev/source/blender/blenkernel/intern/particle.c
    branches/ge_dev/source/blender/blenkernel/intern/shrinkwrap.c
    branches/ge_dev/source/blender/gpu/intern/gpu_draw.c
    branches/ge_dev/source/blender/makesdna/DNA_object_force.h
    branches/ge_dev/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
    branches/ge_dev/source/blender/render/intern/source/occlusion.c
    branches/ge_dev/source/blender/src/buttons_logic.c
    branches/ge_dev/source/blender/src/header_info.c
    branches/ge_dev/source/blender/src/imagepaint.c
    branches/ge_dev/source/blender/src/poseobject.c
    branches/ge_dev/source/blender/src/sequence.c
    branches/ge_dev/source/creator/creator.c
    branches/ge_dev/source/darwin/Makefile
    branches/ge_dev/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/ge_dev/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_dev/source/gameengine/Converter/BL_MeshDeformer.h
    branches/ge_dev/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/ge_dev/source/gameengine/Converter/BL_SkinDeformer.h
    branches/ge_dev/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/ge_dev/source/gameengine/Expressions/InputParser.cpp
    branches/ge_dev/source/gameengine/Expressions/ListValue.cpp
    branches/ge_dev/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/ge_dev/source/gameengine/Expressions/PyObjectPlus.h
    branches/ge_dev/source/gameengine/Expressions/Value.cpp
    branches/ge_dev/source/gameengine/Expressions/Value.h
    branches/ge_dev/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/ge_dev/source/gameengine/Ketsji/KX_Camera.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_Camera.h
    branches/ge_dev/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/ge_dev/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_Dome.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_Dome.h
    branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.h
    branches/ge_dev/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_Light.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_Scene.cpp
    branches/ge_dev/source/gameengine/Ketsji/KX_Scene.h
    branches/ge_dev/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
    branches/ge_dev/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/ge_dev/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/ge_dev/source/gameengine/PyDoc/BL_Shader.py
    branches/ge_dev/source/gameengine/PyDoc/CListValue.py
    branches/ge_dev/source/gameengine/PyDoc/GameKeys.py
    branches/ge_dev/source/gameengine/PyDoc/GameLogic.py
    branches/ge_dev/source/gameengine/PyDoc/KX_BlenderMaterial.py
    branches/ge_dev/source/gameengine/PyDoc/KX_Camera.py
    branches/ge_dev/source/gameengine/PyDoc/KX_ConstraintActuator.py
    branches/ge_dev/source/gameengine/PyDoc/KX_GameObject.py
    branches/ge_dev/source/gameengine/PyDoc/KX_MeshProxy.py
    branches/ge_dev/source/gameengine/PyDoc/KX_PhysicsObjectWrapper.py
    branches/ge_dev/source/gameengine/PyDoc/KX_PolyProxy.py
    branches/ge_dev/source/gameengine/PyDoc/KX_Scene.py
    branches/ge_dev/source/gameengine/PyDoc/KX_SoundActuator.py
    branches/ge_dev/source/gameengine/PyDoc/KX_StateActuator.py
    branches/ge_dev/source/gameengine/PyDoc/KX_VehicleWrapper.py
    branches/ge_dev/source/gameengine/PyDoc/KX_VertexProxy.py
    branches/ge_dev/source/gameengine/PyDoc/Rasterizer.py
    branches/ge_dev/source/gameengine/PyDoc/SCA_ILogicBrick.py
    branches/ge_dev/source/gameengine/PyDoc/SCA_ISensor.py
    branches/ge_dev/source/gameengine/PyDoc/bge_api_validate_py.txt
    branches/ge_dev/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/ge_dev/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/ge_dev/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/ge_dev/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/ge_dev/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/ge_dev/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/ge_dev/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/ge_dev/source/gameengine/VideoTexture/ImageRender.cpp
    branches/ge_dev/tools/Blender.py

Added Paths:
-----------
    branches/ge_dev/source/gameengine/PyDoc/CPropValue.py
    branches/ge_dev/source/gameengine/PyDoc/CValue.py
    branches/ge_dev/source/gameengine/PyDoc/PyObjectPlus.py
    branches/ge_dev/source/gameengine/PyDoc/SCA_IObject.py

Modified: branches/ge_dev/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
===================================================================
--- branches/ge_dev/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj	2009-04-28 13:56:24 UTC (rev 19958)
+++ branches/ge_dev/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj	2009-04-28 14:07:35 UTC (rev 19959)
@@ -166,12 +166,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odelib.lib fmodvc.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python25.lib pthreadVSE2.lib pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
+				AdditionalDependencies="odelib.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python25.lib pthreadVSE2.lib pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib"
 				OutputFile="..\..\..\..\bin\blenderplayer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\openexr\lib_vs2008;..\..\..\..\..\lib\windows\python\lib\lib25_vs2008;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\ffmpeg\lib"
 				IgnoreDefaultLibraryNames="libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\..\..\..\build\msvc_9\libs\blenderplayer.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"

Modified: branches/ge_dev/release/scripts/bpymodules/paths_svg2obj.py
===================================================================
--- branches/ge_dev/release/scripts/bpymodules/paths_svg2obj.py	2009-04-28 13:56:24 UTC (rev 19958)
+++ branches/ge_dev/release/scripts/bpymodules/paths_svg2obj.py	2009-04-28 14:07:35 UTC (rev 19959)
@@ -1,7 +1,7 @@
 # -*- coding: latin-1 -*-
 """
-SVG 2 OBJ translater, 0.5.9n
-Copyright (c) jm soler juillet/novembre 2004-february 2009, 
+SVG 2 OBJ translater, 0.5.9o
+Copyright (c) jm soler juillet/novembre 2004-april 2009, 
 # ---------------------------------------------------------------
     released under GNU Licence 
     for the Blender 2.42 Python Scripts Bundle.
@@ -255,7 +255,7 @@
               - removed  all debug statements
               - correction of a zero division error in the calc_arc function.
 
-		  0.5.9f: - 2007/15/7 
+     0.5.9f: - 2007/15/7 
               - Correction de plusieurs bugs sur l'attributions des couleurs et le nommage 
                 des courbes
 
@@ -266,7 +266,9 @@
      0.5.9k : - 14/01/2009 
      0.5.9l : - 31/01/2009 
      0.5.9n : - 01/02/2009
+     0.5.9o : - 04/04/2009, remove pattern if it made with path.
 
+
 ==================================================================================   
 =================================================================================="""
 SHARP_IMPORT=0
@@ -280,6 +282,7 @@
 LAST_COLOR=[0.0,0.0,0.0,0.0]
 SEPARATE_CURVES=0
 USE_COLORS=0
+PATTERN=0
 
 SVGCOLORNAMELIST={ 'aliceblue':[240, 248, 255] ,'antiquewhite':[250, 235, 215]
 ,'aqua':[ 0, 255, 255], 'aquamarine':[127, 255, 212]
@@ -787,6 +790,7 @@
 		D.append('Z')
 	return D
 
+
 #--------------------
 # 0.5.8, to remove exec 
 #--------------------
@@ -1462,13 +1466,13 @@
 # --------------------------------------------
 def build_HIERARCHY(t):
 	global CP, curves, SCALE, DEBUG, BOUNDINGBOX, scale_, tagTRANSFORM
-	global LAST_ID
+	global LAST_ID, PATTERN
 	TRANSFORM=0
 	t=t.replace('\t',' ')
 	while t.find('  ')!=-1: t=t.replace('  ',' ')
 	n0=0      
 	t0=t1=0
-	baliste=[]
+	#baliste=[]
 	balisetype=['?','?','/','/','!','!']
 	BALISES=['D',  #DECL_TEXTE',
 						'D',  #DECL_TEXTE',
@@ -1490,26 +1494,37 @@
 		if t0>-1 and t1>-1:
 			if t[t0+1] in balisetype:
 				b=balisetype.index(t[t0+1])
+				
 				if t[t0+2]=='-': 
 					b=balisetype.index(t[t0+1])+1
+					
 				balise=BALISES[b]
+				
 				if b==2:
 					parent=STACK.pop(-1)
 					if parent!=None and TRANSFORM>0:
 						TRANSFORM-=1
+						
 			elif t[t1-1] in balisetype:
 				balise=BALISES[balisetype.index(t[t1-1])+1]
+				
 			else:
 				t2=t.find(' ',t0)  
 				if t2>t1: t2=t1
 				ouvrante=1
 				NOM=t[t0+1:t2]
+				
+					
 				if '</'+NOM in t: #.find('</'+NOM)>-1:
 					balise=BALISES[-1]
+					if NOM=='pattern' and not PATTERN:
+						t1=t.find('</'+NOM+'>',t0)+len('</'+NOM+'>')
+						balise=BALISES[-3]
 				else:
 					balise=BALISES[-2]
 					
 			if balise=='E' or balise=='O':
+					
 				proprietes=collect_ATTRIBUTS(t[t0:t1+ouvrante])
 				
 				if  'id' in proprietes:
@@ -1532,6 +1547,11 @@
 					# 0.5.8, to remove exec 
 					#--------------------
 					D=OTHERSSHAPES[proprietes['TYPE']](proprietes)
+					
+				#elif proprietes['TYPE'] in ['pattern']:
+				#	print 'pattern'	
+				#	D=''
+					
 				CP=[0.0,0.0]	
 				if len(D)>0:
 					cursor=0
@@ -1567,7 +1587,7 @@
 
 def scan_FILE(nom):
 	global CP, curves, SCALE, DEBUG, BOUNDINGBOX, scale_, tagTRANSFORM
-	global SEPARATE_CURVES, USE_COLORS
+	global SEPARATE_CURVES, USE_COLORS, PATTERN
 	
 	dir,name=split(nom)
 	name=name.split('.')
@@ -1583,13 +1603,14 @@
 			togAS = Blender.Draw.Create(0)
 			togSP = Blender.Draw.Create(0)
 			togCOL = Blender.Draw.Create(0)
+			Pattern= Blender.Draw.Create(0)
 			block=[\
 				("Clamp Width 1",	togW,  "Rescale the import with a Width of one unit"),\
 				("Clamp Height 1",	togH,  "Rescale the import with a Heightof one unit"),\
 				("No Rescaling",	togAS, "No rescaling, the result can be very large"),\
 				("Separate Curves", togSP, "Create an object for each curve, Slower. May manage colors"),\
-				("Import Colors",	togCOL, "try to import color if the path is set as 'fill'. Only With separate option")]
-
+				("Import Colors",	togCOL, "try to import color if the path is set as 'fill'. Only With separate option"),\
+ 				("Import Patterns",	Pattern, "import pattern content if it is made with paths.")]
 			retval = Blender.Draw.PupBlock("Import Options", block)
 			if  togW.val: scale_=1
 			elif togH.val: 	scale_=2
@@ -1598,6 +1619,8 @@
 			if  togSP.val: SEPARATE_CURVES=1	
 
 			if  togCOL.val and SEPARATE_CURVES : USE_COLORS=1	
+				
+			if	Pattern.val : PATTERN =1
 											
 		t1=Blender.sys.time()
 		# 0.4.1 : to avoid to use sax and the xml  
@@ -1625,4 +1648,4 @@
 
 
 if __name__=='__main__':
-	Blender.Window.FileSelector (functionSELECT, 'SELECT an .SVG FILE', '*.svg')
+	Blender.Window.FileSelector (functionSELECT, 'SELECT an .SVG FILE', '*.svg')
\ No newline at end of file

Modified: branches/ge_dev/release/scripts/colladaExport14.py
===================================================================
--- branches/ge_dev/release/scripts/colladaExport14.py	2009-04-28 13:56:24 UTC (rev 19958)
+++ branches/ge_dev/release/scripts/colladaExport14.py	2009-04-28 14:07:35 UTC (rev 19959)
@@ -9,7 +9,7 @@
 
 __author__ = "Illusoft - Pieter Visser"
 __url__ = ("Project homepage, http://colladablender.illusoft.com")
-__version__ = "0.3.159"
+__version__ = "0.3.160"
 __email__ = "colladablender at illusoft.com"
 __bpydoc__ = """\
 

Modified: branches/ge_dev/release/scripts/colladaImport14.py
===================================================================
--- branches/ge_dev/release/scripts/colladaImport14.py	2009-04-28 13:56:24 UTC (rev 19958)
+++ branches/ge_dev/release/scripts/colladaImport14.py	2009-04-28 14:07:35 UTC (rev 19959)
@@ -9,7 +9,7 @@
 
 __author__ = "Illusoft - Pieter Visser"
 __url__ = ("Project homepage, http://colladablender.illusoft.com")
-__version__ = "0.3.159"
+__version__ = "0.3.160"
 __email__ = "colladablender at illusoft.com"
 __bpydoc__ = """\
 

Modified: branches/ge_dev/release/scripts/console.py
===================================================================
--- branches/ge_dev/release/scripts/console.py	2009-04-28 13:56:24 UTC (rev 19958)
+++ branches/ge_dev/release/scripts/console.py	2009-04-28 14:07:35 UTC (rev 19959)
@@ -708,20 +708,23 @@
 	# Fixed margin. use a margin since 0 margin can be hard to seewhen close to a crt's edge.
 	margin = 4
 	
+	# Convenience
+	FNT_NAME, FNT_HEIGHT = __FONT_SIZES__[__FONT_SIZE__]
+	
 	# Draw cursor location colour
 	if __CONSOLE_LINE_OFFSET__ == 0:
-		cmd2curWidth = Draw.GetStringWidth(cmdBuffer[-1].cmd[:cursor], __FONT_SIZES__[__FONT_SIZE__][0])
+		cmd2curWidth = Draw.GetStringWidth(cmdBuffer[-1].cmd[:cursor], FNT_NAME)
 		BGL.glColor3f(0.8, 0.2, 0.2)
 		if cmd2curWidth == 0:
-			BGL.glRecti(margin,2,margin+2, __FONT_SIZES__[__FONT_SIZE__][1]+2)
+			BGL.glRecti(margin,2,margin+2, FNT_HEIGHT+2)
 		else:
-			BGL.glRecti(margin + cmd2curWidth-2,2, margin+cmd2curWidth, __FONT_SIZES__[__FONT_SIZE__][1]+2)
+			BGL.glRecti(margin + cmd2curWidth-2,2, margin+cmd2curWidth, FNT_HEIGHT+2)
 	
 	BGL.glColor3f(1,1,1)
 	# Draw the set of cammands to the buffer
 	consoleLineIdx = __CONSOLE_LINE_OFFSET__ + 1
 	wrapLineIndex = 0
-	while consoleLineIdx < len(cmdBuffer) and  __CONSOLE_RECT__[3] > (consoleLineIdx - __CONSOLE_LINE_OFFSET__) * __FONT_SIZES__[__FONT_SIZE__][1]:
+	while consoleLineIdx < len(cmdBuffer) and  __CONSOLE_RECT__[3] > (consoleLineIdx - __CONSOLE_LINE_OFFSET__) * FNT_HEIGHT:
 		if cmdBuffer[-consoleLineIdx].type == 0:
 			BGL.glColor3f(1, 1, 1)
 		elif cmdBuffer[-consoleLineIdx].type == 1:
@@ -734,53 +737,41 @@
 			BGL.glColor3f(1, 1, 0)
 		
 		if consoleLineIdx == 1: # user input
-			BGL.glRasterPos2i(margin, (__FONT_SIZES__[__FONT_SIZE__][1] * (consoleLineIdx-__CONSOLE_LINE_OFFSET__)) - 8)
-			Draw.Text(cmdBuffer[-consoleLineIdx].cmd, __FONT_SIZES__[__FONT_SIZE__][0])		
-		else:
-			BGL.glRasterPos2i(margin, (__FONT_SIZES__[__FONT_SIZE__][1] * ((consoleLineIdx-__CONSOLE_LINE_OFFSET__)+wrapLineIndex)) - 8)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list