[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14103] trunk/blender/source/blender/ render/intern/source/convertblender.c: Bugfix for cloth vectorblur ( back to normal)

[Daniel Genrich]

Revision: 14103
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14103
Author:   genscher
Date:     2008-03-14 02:07:09 +0100 (Fri, 14 Mar 2008)

Log Message:
-----------
Bugfix for cloth vectorblur (back to normal)

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2008-03-14 00:17:42 UTC (rev 14102)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2008-03-14 01:07:09 UTC (rev 14103)
@@ -44,7 +44,6 @@
 
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
-#include "DNA_cloth_types.h"
 #include "DNA_material_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_effect_types.h"
@@ -67,7 +66,6 @@
 #include "BKE_anim.h"
 #include "BKE_armature.h"
 #include "BKE_action.h"
-#include "BKE_cloth.h"
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
 #include "BKE_colortools.h"
@@ -5264,83 +5262,6 @@
 	return 1;
 }
 
-static int load_clothsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *vectors, int step)
-{
-	ObjectRen *obr= obi->obr;
-	VertRen *ver= NULL;
-	float *speed, div, zco[2];
-	float zmulx= re->winx/2, zmuly= re->winy/2, len;
-	float winsq= re->winx*re->winy, winroot= sqrt(winsq);
-	int a, j;
-	float hoco[4], ho[4], csvec[4], camco[4];
-	float mat[4][4], winmat[4][4];
-	float imat[4][4];
-	ClothModifierData *clmd = NULL;
-	Cloth *cloth = NULL;
-
-	/* only one step needed */
-	if(step) return 1;
-	
-	Mat4CpyMat4(mat, re->viewmat);
-	MTC_Mat4Invert(imat, mat);
-
-	/* set first vertex OK */
-	clmd = (ClothModifierData *)modifiers_findByType(obr->ob, eModifierType_Cloth);
-	if( !clmd || !(clmd->clothObject) ) return 0;
-	
-	cloth = clmd->clothObject;
-	
-	if( obr->totvert != cloth->numverts ) {
-		return 0;
-	}
-
-	if(obi->flag & R_TRANSFORMED)
-		Mat4MulMat4(winmat, obi->mat, re->winmat);
-	else
-		Mat4CpyMat4(winmat, re->winmat);
-	
-	for(a=0; a<obr->totvert; a++, vectors+=2) {
-		if((a & 255)==0)
-			ver= obr->vertnodes[a>>8].vert;
-		else
-			ver++;
-
-		// get cloth velocity
-		csvec[3] = 0.; 
-		for(j=0;j<3;j++) csvec[j] = cloth->verts[a].v[j];
-
-		// transform (=rotate) to cam space
-		camco[0]= imat[0][0]*csvec[0] + imat[0][1]*csvec[1] + imat[0][2]*csvec[2];
-		camco[1]= imat[1][0]*csvec[0] + imat[1][1]*csvec[1] + imat[1][2]*csvec[2];
-		camco[2]= imat[2][0]*csvec[0] + imat[2][1]*csvec[1] + imat[2][2]*csvec[2];
-
-		// get homogenous coordinates
-		projectvert(camco, winmat, hoco);
-		projectvert(ver->co, winmat, ho);
-		
-		/* now map hocos to screenspace, uses very primitive clip still */
-		// use ho[3] of original vertex, xy component of vel. direction
-		if(ho[3]<0.1f) div= 10.0f;
-		else div= 1.0f/ho[3];
-		zco[0]= zmulx*hoco[0]*div;
-		zco[1]= zmuly*hoco[1]*div;
-		
-		// maximize speed as usual
-		len= zco[0]*zco[0] + zco[1]*zco[1];
-		if(len > winsq) {
-			len= winroot/sqrt(len);
-			zco[0]*= len; zco[1]*= len;
-		}
-		
-		speed= RE_vertren_get_winspeed(obi, ver, 1);
-		// set both to the same value
-		speed[0]= speed[2]= zco[0];
-		speed[1]= speed[3]= zco[1];
-	}
-
-	return 1;
-}
-
 /* makes copy per object of all vectors */
 /* result should be that we can free entire database */
 static void copy_dbase_object_vectors(Render *re, ListBase *lb)
@@ -5473,9 +5394,6 @@
 					// NOTE/FIXME - velocities and meshes loaded unnecessarily often during the database_fromscene_vectors calls...
 					load_fluidsimspeedvectors(re, obi, oldobi->vectors, step);
 				}
-				else if((md = modifiers_findByType(obi->ob, eModifierType_Cloth)) && (md->mode & eModifierMode_Render) ) {
-					load_clothsimspeedvectors(re, obi, oldobi->vectors, step);
-				}
 				else {
 					/* check if both have same amounts of vertices */
 					if(obi->totvector==oldobi->totvector)