X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FAabb.cc;h=4ef15200d80be9b82e4eb2d40b1584be085f62f5;hp=7b2ada7ba7f7f5b6704adf59af8e9962bd64d9aa;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=29e3d45f7bbbf31eadf793c41ff2b3d9c47b7539

diff --git a/src/Moof/Aabb.cc b/src/Moof/Aabb.cc
index 7b2ada7..4ef1520 100644
--- a/src/Moof/Aabb.cc
+++ b/src/Moof/Aabb.cc
@@ -1,63 +1,71 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include <Moof/Aabb.hh>
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
+
+#include "Aabb.hh"
+#include "Frustum.hh"
+#include "OpenGL.hh"
+#include "Texture.hh"
 
 
 namespace Mf {
 
 
-void Aabb::draw(Scalar alpha) const
+	/*
+void Aabb::getOctant(Aabb& octant, int num) const
 {
-	Scalar vertices[] = {min[0], min[1], min[2],
-						 min[0], max[1], min[2],
-						 max[0], max[1], min[2],
-						 max[0], min[1], min[2],
-						 min[0], max[1], max[2],
-						 min[0], min[1], max[2],
-						 max[0], min[1], max[2],
-						 max[0], max[1], max[2]};
-
-	GLubyte indicis[] = {0, 1, 2, 3,
-						 1, 2, 7, 4,
-						 3, 0, 5, 6,
-						 2, 3, 6, 7,
-						 5, 0, 1, 4,
-						 4, 5, 6, 7};
-
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(3, GL_SCALAR, 0, vertices);
-
-	glDrawElements(GL_QUADS, sizeof(indicis), GL_UNSIGNED_BYTE, indicis);
+	Vector3 mid = getCenter();
+
+	switch (num)
+	{
+		case 0:
+			octant.init(Vector3(min[0], min[1], mid[2]),
+						Vector3(mid[0], mid[1], max[2]));
+			break;
+
+		case 1:
+			octant.init(Vector3(mid[0], min[1], mid[2]),
+						Vector3(max[0], mid[1], max[2]));
+			break;
+
+		case 2:
+			octant.init(mid, max);
+			break;
+
+		case 3:
+			octant.init(Vector3(min[0], mid[1], mid[2]),
+						Vector3(mid[0], max[1], max[2]));
+			break;
+
+		case 4:
+			octant.init(min, mid);
+			break;
+
+		case 5:
+			octant.init(Vector3(mid[0], min[1], min[2]),
+						Vector3(max[0], mid[1], mid[2]));
+			break;
+
+		case 6:
+			octant.init(Vector3(mid[0], mid[1], min[2]),
+						Vector3(max[0], max[1], mid[2]));
+			break;
+
+		case 7:
+			octant.init(Vector3(min[0], mid[1], min[2]),
+						Vector3(mid[0], max[1], mid[2]));
+			break;
+	}
 }
+*/
 
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-