gamnit: rewrite `Mesh::dimensions & center` and move to its own module

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/lib/gamnit/depth/depth.nit b/lib/gamnit/depth/depth.nit
index 12d0f15..930c3a0 100644 (file)
--- a/lib/gamnit/depth/depth.nit
+++ b/lib/gamnit/depth/depth.nit
@@ -17,6 +17,7 @@ module depth
 
 intrude import more_materials
 import more_models
+import model_dimensions
 import particles
 
 redef class App

diff --git a/lib/gamnit/depth/depth_core.nit b/lib/gamnit/depth/depth_core.nit
index f1e5803..45863dc 100644 (file)
--- a/lib/gamnit/depth/depth_core.nit
+++ b/lib/gamnit/depth/depth_core.nit
@@ -157,74 +157,6 @@ class Mesh
                        end
                end
        end
-
-       # Dimensions of this geometry using the min and max of all points on each axis
-       var dimensions: Point3d[Float] is lazy, writable do
-               assert vertices.length % 3 == 0
-
-               var minx = inf
-               var miny = inf
-               var minz = inf
-               var maxx = -inf
-               var maxy = -inf
-               var maxz = -inf
-
-               var i = 0
-               while i < vertices.length do
-                       var x = vertices[i]
-                       i += 1
-                       var y = vertices[i]
-                       i += 1
-                       var z = vertices[i]
-                       i += 1
-
-                       minx = minx.min(x)
-                       miny = miny.min(y)
-                       minz = minz.min(z)
-
-                       maxx = maxx.max(x)
-                       maxy = maxy.max(y)
-                       maxz = maxz.max(z)
-               end
-
-               return new Point3d[Float](maxx-minx, maxy-miny, maxz-minz)
-       end
-
-       # Center of the geometry
-       var center: Point3d[Float] is lazy, writable do
-               assert vertices.length % 3 == 0
-
-               var minx = inf
-               var miny = inf
-               var minz = inf
-               var maxx = -inf
-               var maxy = -inf
-               var maxz = -inf
-
-               var i = 0
-               while i < vertices.length do
-                       var x = vertices[i]
-                       i += 1
-                       var y = vertices[i]
-                       i += 1
-                       var z = vertices[i]
-                       i += 1
-
-                       minx = minx.min(x)
-                       miny = miny.min(y)
-                       minz = minz.min(z)
-
-                       maxx = maxx.max(x)
-                       maxy = maxy.max(y)
-                       maxz = maxz.max(z)
-               end
-
-               var center = new Point3d[Float](
-                       (minx+maxx)/2.0,
-                       (miny+maxy)/2.0,
-                       (minz+maxz)/2.0)
-               return center
-       end
 end
 
 # Source of light

diff --git a/lib/gamnit/depth/model_dimensions.nit b/lib/gamnit/depth/model_dimensions.nit
new file mode 100644 (file)
index 0000000..37327af
--- /dev/null
+++ b/lib/gamnit/depth/model_dimensions.nit
@@ -0,0 +1,61 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Dimensions related services for `Model` and `Mesh`
+module model_dimensions
+
+import depth_core
+
+redef class Mesh
+
+       # Dimensions of the bounding box containing all vertices
+       var dimensions = new Point3d[Float](max.x-min.x, max.y-min.y, max.z-min.z) is lazy, writable
+
+       # Center coordinates of all the vertices
+       var center = new Point3d[Float]((min.x+max.x)/2.0, (min.y+max.y)/2.0, (min.z+max.z)/2.0) is lazy, writable
+
+       # Minimum coordinates of all vertices on each axes
+       #
+       # This is a corner of the bounding box.
+       var min: Point3d[Float] is lazy do
+               var mx = inf
+               var my = inf
+               var mz = inf
+               var i = 0
+               while i < vertices.length do
+                       mx = mx.min(vertices[i])
+                       my = my.min(vertices[i+1])
+                       mz = mz.min(vertices[i+2])
+                       i += 3
+               end
+               return new Point3d[Float](mx, my, mz)
+       end
+
+       # Maximum coordinates of all vertices on each axes
+       #
+       # This is a corner of the bounding box.
+        var max: Point3d[Float] is lazy do
+               var mx = -inf
+               var my = -inf
+               var mz = -inf
+               var i = 0
+               while i < vertices.length do
+                       mx = mx.max(vertices[i])
+                       my = my.max(vertices[i+1])
+                       mz = mz.max(vertices[i+2])
+                       i += 3
+               end
+               return new Point3d[Float](mx, my, mz)
+       end
+end

diff --git a/lib/gamnit/depth/more_meshes.nit b/lib/gamnit/depth/more_meshes.nit
index 569973b..eeeb258 100644 (file)
--- a/lib/gamnit/depth/more_meshes.nit
+++ b/lib/gamnit/depth/more_meshes.nit
@@ -17,6 +17,7 @@ module more_meshes
 
 import geometry
 import depth_core
+import model_dimensions
 
 # Simple flat mesh, sits on the axes X and Z, normal on Y
 class Plane