[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29861] branches/soc-2010-aligorith-2/ source/blender: Bullet SoC - File IO Fixed

[Joshua Leung]

Revision: 29861
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29861
Author:   aligorith
Date:     2010-07-02 03:06:24 +0200 (Fri, 02 Jul 2010)

Log Message:
-----------
Bullet SoC - File IO Fixed

It turns out that makesdna was getting confused by some temp comments I had left in, resulting in the relevant structs being assumed to be of length 0.

Modified Paths:
--------------
    branches/soc-2010-aligorith-2/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-aligorith-2/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-aligorith-2/source/blender/makesdna/DNA_rigidbody_types.h

Modified: branches/soc-2010-aligorith-2/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-aligorith-2/source/blender/blenloader/intern/readfile.c	2010-07-02 00:38:04 UTC (rev 29860)
+++ branches/soc-2010-aligorith-2/source/blender/blenloader/intern/readfile.c	2010-07-02 01:06:24 UTC (rev 29861)
@@ -4452,13 +4452,10 @@
 	if(sce->nodetree)
 		direct_link_nodetree(fd, sce->nodetree);
 	
-	printf("rbws pre relink - %p %p \n", sce->rigidbody_worlds.first, sce->rigidbody_worlds.last);
 	link_list(fd, &sce->rigidbody_worlds);
 	if (sce->rigidbody_worlds.first) {
 		RigidBodyWorld *rbw;
 		
-		printf("rbw's read in - %p %p \n", sce->rigidbody_worlds.first, sce->rigidbody_worlds.last);
-		
 		for (rbw = sce->rigidbody_worlds.first; rbw; rbw= rbw->next) {
 			/* must nullify the references to physics sim objects, since they no-longer exist 
 			 * (and will need to be recalculated) 
@@ -4469,8 +4466,6 @@
 			rbw->recalc = RBW_RECALC_REBUILD|RBW_RECALC_REQUIRED;
 		}
 	}
-	else
-		printf("no rbw read in... - %p %p\n", sce->rigidbody_worlds.first, sce->rigidbody_worlds.last);
 }
 
 /* ************ READ WM ***************** */

Modified: branches/soc-2010-aligorith-2/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2010-aligorith-2/source/blender/blenloader/intern/writefile.c	2010-07-02 00:38:04 UTC (rev 29860)
+++ branches/soc-2010-aligorith-2/source/blender/blenloader/intern/writefile.c	2010-07-02 01:06:24 UTC (rev 29861)
@@ -1926,10 +1926,8 @@
 		}
 		
 		/* writing dynamic list of RigidBodyWorlds to the blend file */
-		for(rbw = sce->rigidbody_worlds.first; rbw; rbw = rbw->next) {
-			printf("RigidBodyWorld saved...\n");
+		for(rbw = sce->rigidbody_worlds.first; rbw; rbw = rbw->next)
 			writestruct(wd, DATA, "RigidBodyWorld", 1, rbw);
-		}
 		
 		sce= sce->id.next;
 	}

Modified: branches/soc-2010-aligorith-2/source/blender/makesdna/DNA_rigidbody_types.h
===================================================================
--- branches/soc-2010-aligorith-2/source/blender/makesdna/DNA_rigidbody_types.h	2010-07-02 00:38:04 UTC (rev 29860)
+++ branches/soc-2010-aligorith-2/source/blender/makesdna/DNA_rigidbody_types.h	2010-07-02 01:06:24 UTC (rev 29861)
@@ -53,17 +53,13 @@
 	short flag;					/* (eRigidBodyWorld_Flag) settings for this RigidBodyWorld */
 	short recalc;				/* (eRigidBodyWorld_Recalc) flags set via Depsgraph/eval */
 	
-		// XXX: review these
+		/* XXX: review these... */
 	short max_timestep;			/* maximum timestep size to take */
 	short substeps;				/* number of sub-frame samples to take for more accurate results */
 	
 	float sframe;				/* start frame of simulation - can be different to scene sfra, to allow for preroll */
 	float ltime;				/* last frame world was evaluated for */
 	
-	
-	// TODO: add settings for
-	//	- broadphase algorithm to use
-	
 	/* References to Physics Sim objects. Exist at runtime only ---------------------- */
 	void *physics_world;		/* Physics sim world (i.e. btDiscreteDynamicsWorld) */
 } RigidBodyWorld;
@@ -105,7 +101,6 @@
 	int flag;				/* (eRigidBodyOb_Flag) */
 	
 	/* Physics Parameters */
-	// XXX: just a few demo ones here so far...
 	float mass;				
 	float friction;
 } RigidBodyOb;