Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/pure-cfg/src/include/Diderot/inline-image.h
ViewVC logotype

Diff of /branches/pure-cfg/src/include/Diderot/inline-image.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 724, Fri Apr 1 22:56:25 2011 UTC revision 726, Fri Apr 1 23:50:29 2011 UTC
# Line 14  Line 14 
14  #ifndef _DIDEROT_TYPES_H_  #ifndef _DIDEROT_TYPES_H_
15  #include "types.h"  #include "types.h"
16  #endif  #endif
17    #ifndef _DIDEROT_INLINE_VEC2_H_
18    #  include "inline-vec2.h"
19    #endif
20    #ifndef _DIDEROT_INLINE_VEC3_H_
21    #  include "inline-vec3.h"
22    #endif
23    #ifndef _DIDEROT_INLINE_VEC4_H_
24    #  include "inline-vec4.h"
25    #endif
26    
27    /***** 2D Image functions *****/
28    
29  // check if pos is inside the img, assuming that we have a border of width s.  // check if pos is inside the img, assuming that we have a border of width s.
30  //  //
# Line 40  Line 51 
51          dot3f(img->mInv[1].v, p));          dot3f(img->mInv[1].v, p));
52  }  }
53    
54    /***** 3D Image functions *****/
55    
56  // check if pos is inside the img, assuming that we have a border of width s.  // check if pos is inside the img, assuming that we have a border of width s.
57  //  //
58  STATIC_INLINE bool Diderot_Inside3f (vec3f_t posArg, Diderot_image3D_t *img, int s)  STATIC_INLINE bool Diderot_Inside3f (vec3f_t posArg, Diderot_image3D_t *img, int s)
# Line 62  Line 75 
75          ((union3f_t)posArg).r[2],          ((union3f_t)posArg).r[2],
76          1.0f);          1.0f);
77    
 //    return vec3f(  
 //      dot4f(vec4f(m->m[0], m->m[1], m->m[2], m->m[3]), p),  
 //      dot4f(vec4f(m->m[4], m->m[5], m->m[6], m->m[7]), p),  
 //      dot4f(vec4f(m->m[8], m->m[9], m->m[10], m->m[11]), p));  
78      return vec3f(      return vec3f(
79          dot4f(img->mInv[0].v, p),          dot4f(img->mInv[0].v, p),
80          dot4f(img->mInv[1].v, p),          dot4f(img->mInv[1].v, p),
81          dot4f(img->mInv[2].v, p));          dot4f(img->mInv[2].v, p));
82  }  }
83    
   
84  #endif /* !_DIDEROT_INLINE_IMAGE_H_ */  #endif /* !_DIDEROT_INLINE_IMAGE_H_ */

Legend:
Removed from v.724  
changed lines
  Added in v.726

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0