[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20600] branches/soc-2009-jaguarandi/ source/blender/render: RayObject to support instances..

[André Pinto]

Revision: 20600
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20600
Author:   jaguarandi
Date:     2009-06-03 16:42:28 +0200 (Wed, 03 Jun 2009)

Log Message:
-----------
RayObject to support instances..
its not still plugged in the renderer, as so, it hasn't been tested yet

Modified Paths:
--------------
    branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h

Added Paths:
-----------
    branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_instance.c

Modified: branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h	2009-06-03 11:22:49 UTC (rev 20599)
+++ branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h	2009-06-03 14:42:28 UTC (rev 20600)
@@ -46,6 +46,7 @@
 /* RayObject constructors */
 RayObject* RE_rayobject_octree_create(int ocres, int size);
 RayObject* RE_rayobject_bvh_create(int size);
+RayObject *RE_rayobject_instance_create(RayObject *target, float transform[][4]);
 
 //RayObject* RayObject_derivedmesh_create(struct DerivedMesh*, void *ob);
 RayObject* RE_rayobject_mesh_create(struct Mesh*, void *ob);

Added: branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_instance.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_instance.c	                        (rev 0)
+++ branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_instance.c	2009-06-03 14:42:28 UTC (rev 20600)
@@ -0,0 +1,139 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): André Pinto.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#include <assert.h>
+
+#include "MEM_guardedalloc.h"
+#include "BKE_utildefines.h"
+#include "BLI_arithb.h"
+#include "RE_raytrace.h"
+#include "rayobject.h"
+
+static int  RayObject_instance_intersect(RayObject *o, Isect *isec);
+static void RayObject_instance_free(RayObject *o);
+static void RayObject_instance_bb(RayObject *o, float *min, float *max);
+
+static RayObjectAPI instance_api =
+{
+	RayObject_instance_intersect,
+	NULL, //static void RayObject_instance_add(RayObject *o, RayObject *ob);
+	NULL, //static void RayObject_instance_done(RayObject *o);
+	RayObject_instance_free,
+	RayObject_instance_bb
+};
+
+typedef struct InstanceRayObject
+{
+	RayObject rayobj;
+	RayObject *target;
+	float global2target[4][4];
+	float target2global[4][4];
+	
+} InstanceRayObject;
+
+
+RayObject *RE_rayobject_instance_create(RayObject *target, float transform[][4])
+{
+	InstanceRayObject *obj= (InstanceRayObject*)MEM_callocN(sizeof(InstanceRayObject), "InstanceRayObject");
+	assert( RayObject_isAligned(obj) ); /* RayObject API assumes real data to be 4-byte aligned */	
+	
+	obj->rayobj.api = &instance_api;
+	obj->target = target;
+	
+	Mat4CpyMat4(obj->global2target, transform);
+	Mat4Invert(obj->target2global, obj->global2target);
+	
+	return RayObject_unalign((RayObject*) obj);
+}
+
+static int  RayObject_instance_intersect(RayObject *o, Isect *isec)
+{
+	//TODO
+	// *there is probably a faster way to convert between coordinates
+	
+	InstanceRayObject *obj = (InstanceRayObject*)o;
+	int res;
+	float start[3], vec[3], labda_point[3], labda;
+	
+	
+	VECCOPY( start, isec->start );
+	VECCOPY( vec  , isec->vec   );
+	labda = isec->labda;
+	VECADDFAC( labda_point, start, vec, labda );
+	
+	
+	//Transform to target coordinates system
+	VECADD( isec->vec, isec->vec, isec->start );	
+	VecMat4MulVecfl(isec->start, obj->target2global, isec->start);
+	VecMat4MulVecfl(isec->vec  , obj->target2global, isec->vec);
+	VecMat4MulVecfl(labda_point, obj->target2global, labda_point);
+	isec->labda = VecLenf( isec->start, labda_point );
+	VECSUB( isec->vec, isec->vec, isec->start );
+	
+	//Raycast
+	res = RE_rayobject_intersect(obj->target, isec);
+
+	//Restore coordinate space coords
+	if(res == 0)
+		isec->labda = labda;
+	else
+	{
+		VECADDFAC( labda_point, isec->start, isec->vec, isec->labda );
+		VecMat4MulVecfl(labda_point, obj->global2target, labda_point);
+		isec->labda = VecLenf( start, labda_point );
+		
+	}
+	VECCOPY( isec->start, start );
+	VECCOPY( isec->vec, vec );
+	
+	return res;
+}
+
+static void RayObject_instance_free(RayObject *o)
+{
+	InstanceRayObject *obj = (InstanceRayObject*)o;
+	MEM_freeN(obj);
+}
+
+static void RayObject_instance_bb(RayObject *o, float *min, float *max)
+{
+	//TODO:
+	// *better bb.. calculated witouth rotations of bb
+	// *maybe cache that better fitted BB at the InstanceRayObject
+	InstanceRayObject *obj = (InstanceRayObject*)o;
+
+	float m[3], M[3];
+	INIT_MINMAX(m, M);
+	RE_rayobject_merge_bb(obj->target, m, M);
+
+	VecMat4MulVecfl(m, obj->target2global, m);
+	VecMat4MulVecfl(M, obj->target2global, M);
+
+	DO_MINMAX(m, min, max);
+	DO_MINMAX(M, min, max);
+}


Property changes on: branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_instance.c
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native