Revision: 44832
http://brlcad.svn.sourceforge.net/brlcad/?rev=44832&view=rev
Author: brlcad
Date: 2011-06-08 21:40:16 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
untested (don't have osl/oiio/boost installed), but should work just fine to
use VMOVE for Vec3's too if [] is defined.
Modified Paths:
--------------
brlcad/trunk/src/liboptical/osl-renderer.cpp
brlcad/trunk/src/liboptical/osl-renderer.h
Modified: brlcad/trunk/src/liboptical/osl-renderer.cpp
===================================================================
--- brlcad/trunk/src/liboptical/osl-renderer.cpp 2011-06-08 21:28:37 UTC
(rev 44831)
+++ brlcad/trunk/src/liboptical/osl-renderer.cpp 2011-06-08 21:40:16 UTC
(rev 44832)
@@ -93,19 +93,18 @@
shadingsys->clear_state();
}
ClosureColor * OSLRenderer::ExecuteShaders(ShaderGlobals globals, RenderInfo
*info){
-
- PointTtoVec3(info->P, globals.P);
- PointTtoVec3(info->I, globals.I);
- PointTtoVec3(info->N, globals.Ng);
+ VMOVE(globals.P, info->P);
+ VMOVE(globals.I, info->I);
+ VMOVE(globals.Ng, info->N);
globals.N = globals.Ng;
// u-v coordinates
globals.u = info->u;
globals.v = info->v;
- // tangents
- PointTtoVec3(info->dPdu, globals.dPdu);
- PointTtoVec3(info->dPdv, globals.dPdv);
+ // u-v tangents
+ VMOVE(globals.dPdu, info->dPdu);
+ VMOVE(globals.dPdv, info->dPdv);
// other
globals.raytype |= ((info->depth == 0) & (1 << 1));
Modified: brlcad/trunk/src/liboptical/osl-renderer.h
===================================================================
--- brlcad/trunk/src/liboptical/osl-renderer.h 2011-06-08 21:28:37 UTC (rev
44831)
+++ brlcad/trunk/src/liboptical/osl-renderer.h 2011-06-08 21:40:16 UTC (rev
44832)
@@ -52,15 +52,6 @@
ThreadInfo thread_info;
ShadingAttribStateRef shaderstate;
- /* Convert a point_t to Vec3 */
- void PointTtoVec3(point_t p, Vec3 &v){
- v[0] = p[0]; v[1] = p[1]; v[2] = p[2];
- }
- /* Convert a Vec3 to floatf_t[3] */
- void Vec3toPointT(Vec3 &v, point_t p){
- p[0] = v[0]; p[1] = v[1]; p[2] = v[2];
- }
-
/* Load OSL shaders
FIXME: Add support for any osl shader */
void InitShaders();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
