Commit: 16202daaf3a0452c6d0d28cb1381aeba50ce73bf - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: 16202daaf3a0452c6d0d28cb1381aeba50ce73bf (tree)
• Time: 2018-07-09 06:45:16
• Author: Pavel Rojtberg <rojtberg@gmai...>
• Commiter: Pavel Rojtberg

Log Message

Samples: VolumeTex - fix bounds computations

Change Summary

• modified: Samples/VolumeTex/src/ThingRenderable.cpp
• modified: Samples/VolumeTex/src/VolumeRenderable.cpp

Incremental Difference

diff -r 81ecb2520c5e -r 16202daaf3a0 Samples/VolumeTex/src/ThingRenderable.cpp
--- a/Samples/VolumeTex/src/ThingRenderable.cpp	Sun Jul 08 23:37:12 2018 +0200
+++ b/Samples/VolumeTex/src/ThingRenderable.cpp	Sun Jul 08 23:45:16 2018 +0200
@@ -168,13 +168,6 @@
 }
 Ogre::Real ThingRenderable::getSquaredViewDepth(const Ogre::Camera* cam) const
 {
-    Ogre::Vector3 min, max, mid, dist;
-
-    min = mBox.getMinimum();
-    max = mBox.getMaximum();
-    mid = ((min - max) * 0.5) + min;
-    dist = cam->getDerivedPosition() - mid;
-                                                                        
-    return dist.squaredLength();
+    return (cam->getDerivedPosition() - mBox.getCenter()).squaredLength();
 }
 

diff -r 81ecb2520c5e -r 16202daaf3a0 Samples/VolumeTex/src/VolumeRenderable.cpp
--- a/Samples/VolumeTex/src/VolumeRenderable.cpp	Sun Jul 08 23:37:12 2018 +0200
+++ b/Samples/VolumeTex/src/VolumeRenderable.cpp	Sun Jul 08 23:45:16 2018 +0200
@@ -27,11 +27,11 @@
 
 VolumeRenderable::VolumeRenderable(size_t nSlices, float size, const String &texture):
     mSlices(nSlices),
-    mSize(size),
+    mSize(size/2),
     mTexture(texture)
 {
-    mRadius = sqrtf(size*size+size*size+size*size)/2.0f;
-    mBox = Ogre::AxisAlignedBox(-size, -size, -size, size, size, size);
+    mBox = Ogre::AxisAlignedBox(-mSize, -mSize, -mSize, mSize, mSize, mSize);
+    mRadius = mBox.getMaximum().length();
     
     // No shadows
     setCastShadows(false);
@@ -132,9 +132,9 @@
             float zcoord = -((float)x/(float)(mSlices-1)  - 0.5f);
             // 1.0f .. a/(a+1)
             // coordinate
-            vertices[x*4*elemsize+y*elemsize+0] = xcoord*(mSize/2.0f);
-            vertices[x*4*elemsize+y*elemsize+1] = ycoord*(mSize/2.0f);
-            vertices[x*4*elemsize+y*elemsize+2] = zcoord*(mSize/2.0f);
+            vertices[x*4*elemsize+y*elemsize+0] = xcoord*mSize;
+            vertices[x*4*elemsize+y*elemsize+1] = ycoord*mSize;
+            vertices[x*4*elemsize+y*elemsize+2] = zcoord*mSize;
             // normal
             vertices[x*4*elemsize+y*elemsize+3] = 0.0f;
             vertices[x*4*elemsize+y*elemsize+4] = 0.0f;
@@ -232,13 +232,6 @@
 }
 Ogre::Real VolumeRenderable::getSquaredViewDepth(const Ogre::Camera* cam) const
 {
-    Ogre::Vector3 min, max, mid, dist;
-
-    min = mBox.getMinimum();
-    max = mBox.getMaximum();
-    mid = ((min - max) * 0.5) + min;
-    dist = cam->getDerivedPosition() - mid;
-                                                                        
-    return dist.squaredLength();
+    return (cam->getDerivedPosition() - mBox.getCenter()).squaredLength();
 }