Revision: 20180
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20180
Author: jaguarandi
Date: 2009-05-13 03:56:03 +0200 (Wed, 13 May 2009)
Log Message:
-----------
Renamed exported functions from render to have the RE_ prefix
RayObject_* => RE_rayobject_*
Modified Paths:
--------------
branches/soc-2009-jaguarandi/source/blender/editors/armature/meshlaplacian.c
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_mesh.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_octree.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rendercore.c
Modified:
branches/soc-2009-jaguarandi/source/blender/editors/armature/meshlaplacian.c
===================================================================
---
branches/soc-2009-jaguarandi/source/blender/editors/armature/meshlaplacian.c
2009-05-13 00:20:14 UTC (rev 20179)
+++
branches/soc-2009-jaguarandi/source/blender/editors/armature/meshlaplacian.c
2009-05-13 01:56:03 UTC (rev 20180)
@@ -401,7 +401,7 @@
MFace *mface;
int a;
- sys->heat.raytree = RayObject_mesh_create(me, me);
+ sys->heat.raytree = RE_rayobject_mesh_create(me, me);
sys->heat.vface = MEM_callocN(sizeof(MFace*)*me->totvert, "HeatVFaces");
for(a=0, mface=me->mface; a<me->totface; a++, mface++) {
@@ -445,7 +445,7 @@
VecMulf(dir, 1e-5);
VecAddf(isec.start, isec.start, dir);
#endif
- visible= !RayObject_raycast(sys->heat.raytree, &isec);
+ visible= !RE_rayobject_raycast(sys->heat.raytree, &isec);
return visible;
}
@@ -709,7 +709,7 @@
/* free */
if(vertsflipped) MEM_freeN(vertsflipped);
- RayObject_free(sys->heat.raytree);
+ RE_rayobject_free(sys->heat.raytree);
MEM_freeN(sys->heat.vface);
MEM_freeN(sys->heat.mindist);
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-05-13 00:20:14 UTC (rev 20179)
+++
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
2009-05-13 01:56:03 UTC (rev 20180)
@@ -38,16 +38,16 @@
struct DerivedMesh;
struct Mesh;
-int RayObject_raycast(RayObject *r, Isect *i);
-void RayObject_add (RayObject *r, RayObject *);
-void RayObject_done(RayObject *r);
-void RayObject_free(RayObject *r);
+int RE_rayobject_raycast(RayObject *r, Isect *i);
+void RE_rayobject_add (RayObject *r, RayObject *);
+void RE_rayobject_done(RayObject *r);
+void RE_rayobject_free(RayObject *r);
/* RayObject constructors */
-RayObject* RayObject_octree_create(int ocres, int size);
+RayObject* RE_rayobject_octree_create(int ocres, int size);
//RayObject* RayObject_derivedmesh_create(struct DerivedMesh*, void *ob);
-RayObject* RayObject_mesh_create(struct Mesh*, void *ob);
+RayObject* RE_rayobject_mesh_create(struct Mesh*, void *ob);
/* Ray Intersection */
struct Isect
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
===================================================================
---
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
2009-05-13 00:20:14 UTC (rev 20179)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
2009-05-13 01:56:03 UTC (rev 20180)
@@ -84,19 +84,19 @@
};
-typedef int (*RayObject_raycast_callback)(RayObject *, Isect *);
-typedef void (*RayObject_add_callback)(RayObject *, RayObject *);
-typedef void (*RayObject_done_callback)(RayObject *);
-typedef void (*RayObject_free_callback)(RayObject *);
-typedef void (*RayObject_bb_callback)(RayObject *, float *min, float *max);
+typedef int (*RE_rayobject_raycast_callback)(RayObject *, Isect *);
+typedef void (*RE_rayobject_add_callback)(RayObject *, RayObject *);
+typedef void (*RE_rayobject_done_callback)(RayObject *);
+typedef void (*RE_rayobject_free_callback)(RayObject *);
+typedef void (*RE_rayobject_merge_bb_callback)(RayObject *, float *min, float
*max);
typedef struct RayObjectAPI
{
- RayObject_raycast_callback raycast;
- RayObject_add_callback add;
- RayObject_done_callback done;
- RayObject_free_callback free;
- RayObject_bb_callback bb;
+ RE_rayobject_raycast_callback raycast;
+ RE_rayobject_add_callback add;
+ RE_rayobject_done_callback done;
+ RE_rayobject_free_callback free;
+ RE_rayobject_merge_bb_callback bb;
} RayObjectAPI;
@@ -104,18 +104,19 @@
#define RayObject_align(o) ((RayObject*)(((int)o)&(~3)))
#define RayObject_unalign(o) ((RayObject*)(((int)o)|1))
#define RayObject_isFace(o) ((((int)o)&3) == 0)
+#define RayObject_isAligned(o) ((((int)o)&3) == 0)
/*
* Extend min/max coords so that the rayobject is inside them
*/
-void RayObject_merge_bb(RayObject *ob, float *min, float *max);
+void RE_rayobject_merge_bb(RayObject *ob, float *min, float *max);
/*
- * This function differs from RayObject_raycast
- * RayObject_intersect does NOT perform last-hit optimization
+ * This function differs from RE_rayobject_raycast
+ * RE_rayobject_intersect does NOT perform last-hit optimization
* So this is probably a function to call inside raytrace structures
*/
-int RayObject_intersect(RayObject *r, Isect *i);
+int RE_rayobject_intersect(RayObject *r, Isect *i);
#define ISECT_EPSILON ((float)FLT_EPSILON)
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
===================================================================
---
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
2009-05-13 00:20:14 UTC (rev 20179)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
2009-05-13 01:56:03 UTC (rev 20180)
@@ -26,7 +26,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-#include "assert.h"
+#include <assert.h>
#include "BKE_utildefines.h"
@@ -270,15 +270,15 @@
return 0;
}
-int RayObject_raycast(RayObject *r, Isect *i)
+int RE_rayobject_raycast(RayObject *r, Isect *i)
{
- if(i->mode==RE_RAY_SHADOW && i->last_hit &&
RayObject_intersect(i->last_hit, i))
+ if(i->mode==RE_RAY_SHADOW && i->last_hit &&
RE_rayobject_intersect(i->last_hit, i))
return 1;
- return RayObject_intersect(r, i);
+ return RE_rayobject_intersect(r, i);
}
-int RayObject_intersect(RayObject *r, Isect *i)
+int RE_rayobject_intersect(RayObject *r, Isect *i)
{
assert(i->mode==RE_RAY_SHADOW);
if(RayObject_isFace(r))
@@ -304,25 +304,25 @@
}
}
-void RayObject_add(RayObject *r, RayObject *o)
+void RE_rayobject_add(RayObject *r, RayObject *o)
{
r = RayObject_align( r );
return r->api->add( r, o );
}
-void RayObject_done(RayObject *r)
+void RE_rayobject_done(RayObject *r)
{
r = RayObject_align( r );
r->api->done( r );
}
-void RayObject_free(RayObject *r)
+void RE_rayobject_free(RayObject *r)
{
r = RayObject_align( r );
r->api->free( r );
}
-void RayObject_merge_bb(RayObject *r, float *min, float *max)
+void RE_rayobject_merge_bb(RayObject *r, float *min, float *max)
{
if(RayObject_isFace(r))
{
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_mesh.c
===================================================================
---
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_mesh.c
2009-05-13 00:20:14 UTC (rev 20179)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_mesh.c
2009-05-13 01:56:03 UTC (rev 20180)
@@ -26,6 +26,8 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
+#include <assert.h>
+
#include "rayobject.h"
#include "MEM_guardedalloc.h"
@@ -66,7 +68,7 @@
RayMesh *rm= (RayMesh*)o;
int i, hit = 0;
for(i = 0; i<rm->num_faces; i++)
- if(RayObject_raycast( (RayObject*)rm->faces+i, isec ))
+ if(RE_rayobject_raycast( (RayObject*)rm->faces+i, isec ))
{
hit = 1;
if(isec->mode == RE_RAY_SHADOW)
@@ -99,13 +101,15 @@
DO_MINMAX( rm->mesh->mvert[i].co, min, max);
}
-RayObject* RayObject_mesh_create(Mesh *mesh, void *ob)
+RayObject* RE_rayobject_mesh_create(Mesh *mesh, void *ob)
{
RayMesh *rm= MEM_callocN(sizeof(RayMesh), "Octree");
int i;
RayFace *face;
MFace *mface;
+ assert( RayObject_isAligned(rm) ); /* RayObject API assumes real data
to be 4-byte aligned */
+
rm->rayobj.api = &mesh_api;
rm->mesh = mesh;
rm->faces = MEM_callocN(sizeof(RayFace)*mesh->totface, "octree
rayobject nodes");
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_octree.c
===================================================================
---
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_octree.c
2009-05-13 00:20:14 UTC (rev 20179)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject_octree.c
2009-05-13 01:56:03 UTC (rev 20180)
@@ -447,9 +447,10 @@
}
-RayObject *RayObject_octree_create(int ocres, int size)
+RayObject *RE_rayobject_octree_create(int ocres, int size)
{
Octree *oc= MEM_callocN(sizeof(Octree), "Octree");
+ assert( RayObject_isAligned(oc) ); /* RayObject API assumes real data
to be 4-byte aligned */
oc->rayobj.api = &octree_api;
@@ -600,7 +601,7 @@
/* Calculate Bounding Box */
for(c=0; c<oc->ro_nodes_used; c++)
- RayObject_merge_bb(oc->ro_nodes[c], oc->min, oc->max);
+ RE_rayobject_merge_bb(oc->ro_nodes[c], oc->min, oc->max);
/* Alloc memory */
oc->adrbranch= MEM_callocN(sizeof(void *)*BRANCH_ARRAY, "octree
branches");
@@ -667,7 +668,7 @@
if( (ov->ocx & ocval.ocx) && (ov->ocy & ocval.ocy) &&
(ov->ocz & ocval.ocz) )
{
- if( RayObject_intersect(face,is) )
+ if( RE_rayobject_intersect(face,is) )
return 1;
}
}
@@ -693,7 +694,7 @@
if( (ov->ocx & ocval.ocx) && (ov->ocy & ocval.ocy) &&
(ov->ocz & ocval.ocz) )
{
- if( RayObject_raycast(face,is) )
+ if( RE_rayobject_raycast(face,is) )
if(isect.labda<is->labda) {
*is= isect;
found= 1;
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
2009-05-13 00:20:14 UTC (rev 20179)
+++ branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
2009-05-13 01:56:03 UTC (rev 20180)
@@ -109,7 +109,7 @@
void freeraytree(Render *re)
{
if(re->raytree) {
- RayObject_free(re->raytree);
+ RE_rayobject_free(re->raytree);
re->raytree= NULL;
MEM_freeN( re->rayfaces );
}
@@ -144,7 +144,7 @@
}
}
- re->raytree = RayObject_octree_create( re->r.ocres, totface );
+ re->raytree = RE_rayobject_octree_create( re->r.ocres, totface );
//Fill rayfaces
re->rayfaces = (RayObject*)MEM_callocN(totface*sizeof(RayFace), "render
faces");
@@ -187,14 +187,14 @@
cur_face->ob = (void*)obi;
cur_face->face = vlr;
- RayObject_add( re->raytree,
(RayObject*) cur_face );
+ RE_rayobject_add( re->raytree,
(RayObject*) cur_face );
cur_face++;
}
}
}
}
- RayObject_done( re->raytree );
+ RE_rayobject_done( re->raytree );
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
