Text archives Help

---

Author: sparker
Date: Wed Jan  4 14:10:59 2006
New Revision: 817

Modified:
   branches/vertical/Model/TexCoordMappers/CMakeLists.txt
   branches/vertical/Model/TexCoordMappers/LinearMapper.cc
   branches/vertical/Model/TexCoordMappers/SphericalMapper.cc
Log:
Updated Mappers to new world


Modified: branches/vertical/Model/TexCoordMappers/CMakeLists.txt
==============================================================================
--- branches/vertical/Model/TexCoordMappers/CMakeLists.txt      (original)
+++ branches/vertical/Model/TexCoordMappers/CMakeLists.txt      Wed Jan  4 
14:10:59 2006
@@ -2,8 +2,8 @@
 SET (Manta_TexCoordMappers_SRCS
      TexCoordMappers/UniformMapper.h
      TexCoordMappers/UniformMapper.cc
-     #TexCoordMappers/SphericalMapper.h
-     #TexCoordMappers/SphericalMapper.cc
-     #TexCoordMappers/LinearMapper.h
-     #TexCoordMappers/LinearMapper.cc
+     TexCoordMappers/SphericalMapper.h
+     TexCoordMappers/SphericalMapper.cc
+     TexCoordMappers/LinearMapper.h
+     TexCoordMappers/LinearMapper.cc
 )

Modified: branches/vertical/Model/TexCoordMappers/LinearMapper.cc
==============================================================================
--- branches/vertical/Model/TexCoordMappers/LinearMapper.cc     (original)
+++ branches/vertical/Model/TexCoordMappers/LinearMapper.cc     Wed Jan  4 
14:10:59 2006
@@ -26,12 +26,9 @@
                                      RayPacket& rays) const
 {
   rays.computeHitPositions();
-  for(int i = 0;i<rays.getSize();i++){
-    RayPacket::Element& e = rays.get(i);
-
+  for(int i = rays.begin();i<rays.end();i++)
     // Unproject a hit point by multiplying by inverse.
-    e.texCoords = transform * e.hitPosition;
-  }
+    rays.setTexCoords(i, transform * rays.getHitPosition(i));
   rays.setFlag(RayPacket::HaveTexture2|RayPacket::HaveTexture3);
 }
 
@@ -39,11 +36,8 @@
                                      RayPacket& rays) const
 {
   rays.computeHitPositions();
-  for(int i = 0;i<rays.getSize();i++){
-    RayPacket::Element& e = rays.get(i);
-
-        // Unproject a hit point by multiplying by inverse.
-    e.texCoords = transform * e.hitPosition;
-  }
+  for(int i = rays.begin();i<rays.end();i++)
+    // Unproject a hit point by multiplying by inverse.
+    rays.setTexCoords(i, transform * rays.getHitPosition(i));
   rays.setFlag(RayPacket::HaveTexture2|RayPacket::HaveTexture3);
 }

Modified: branches/vertical/Model/TexCoordMappers/SphericalMapper.cc
==============================================================================
--- branches/vertical/Model/TexCoordMappers/SphericalMapper.cc  (original)
+++ branches/vertical/Model/TexCoordMappers/SphericalMapper.cc  Wed Jan  4 
14:10:59 2006
@@ -21,16 +21,15 @@
                                      RayPacket& rays) const
 {
   rays.computeHitPositions();
-  for(int i = 0;i<rays.getSize();i++){
-    RayPacket::Element& e = rays.get(i);
-    Vector n = e.hitPosition-center;
+  for(int i = rays.begin();i<rays.end();i++){
+    Vector n = rays.getHitPosition(i)-center;
     Real w = n.normalize() * inv_radius;
     Real angle = Clamp(n.z(), (Real)-1, (Real)1);
     Real theta = Acos(angle);
     Real phi = Atan2(n.x(), n.y());
-    e.texCoords = Point((phi+(Real)M_PI)*(Real)(0.5*M_1_PI),
-                        theta*(Real)M_1_PI,
-                        w);
+    rays.setTexCoords(i, Point((phi+(Real)M_PI)*(Real)(0.5*M_1_PI),
+                               theta*(Real)M_1_PI,
+                               w));
   }
   rays.setFlag(RayPacket::HaveTexture2|RayPacket::HaveTexture3);
 }
@@ -39,16 +38,15 @@
                                      RayPacket& rays) const
 {
   rays.computeHitPositions();
-  for(int i = 0;i<rays.getSize();i++){
-    RayPacket::Element& e = rays.get(i);
-    Vector n = e.hitPosition-center;
+  for(int i = rays.begin();i<rays.end();i++){
+    Vector n = rays.getHitPosition(i)-center;
     Real w = n.normalize() * inv_radius;
     Real angle = Clamp(n.z(), (Real)-1, (Real)1);
     Real theta = Acos(angle);
     Real phi = Atan2(n.x(), n.y());
-    e.texCoords = Point((phi+(Real)M_PI)*(Real)(0.5*M_1_PI),
-                        theta*(Real)M_1_PI,
-                        w);
+    rays.setTexCoords(i, Point((phi+(Real)M_PI)*(Real)(0.5*M_1_PI),
+                               theta*(Real)M_1_PI,
+                               w));
   }
   rays.setFlag(RayPacket::HaveTexture2|RayPacket::HaveTexture3);
 }

---

• [MANTA] r817 - branches/vertical/Model/TexCoordMappers, sparker, 01/04/2006

---

Archive powered by MHonArc 2.6.16.