Octree improvment / Mesh scaling positioning

filter duplicate objects

Author: ivonu

read_obj.js

@@ -2,9 +2,9 @@
 // DO NOT change the content of this file except for implementing the computeNormals() function
 // to load a mesh you need to call: var myMesh = readOBJ('./data/mesh.obj');
 
-function readOBJ(path) {
+function readOBJ(path, position, scale) {
 	console.log("Reading OBJ file: " + path);
-	var obj = new Mesh();
+	var obj = new Mesh(position, scale);
 	var req = new XMLHttpRequest();
 	req.open('GET', path, false);
 

src/objects/mesh.js

@@ -1,4 +1,4 @@
-var Mesh = function() {
+var Mesh = function(_position, _scale) {
     this.V = new Array(); // array of vertices
     this.F = new Array(); // array of triangles
     this.N = new Array(); // array of normals
@@ -7,8 +7,8 @@ var Mesh = function() {
 
     this.material = null;
 
-    this.position = null;
-    this.scale = null;
+    this.position = _position;
+    this.scale = _scale;
 
     this.octree = new Octree (null, 0);
 };
@@ -21,9 +21,9 @@ Mesh.prototype.generateTriangles = function () {
     for (var i = 0; i < this.F.length; i++) {
         var face = this.F[i];
         var triangle = new Triangle (
-            this.V[face.e(1)],
-            this.V[face.e(2)],
-            this.V[face.e(3)],
+            this.V[face.e(1)].multiply(this.scale).add(this.position),
+            this.V[face.e(2)].multiply(this.scale).add(this.position),
+            this.V[face.e(3)].multiply(this.scale).add(this.position),
             null
         );
         this.triangles[i] = triangle;
@@ -37,6 +37,11 @@ Mesh.prototype.intersects = function (ray) {
     var min_intersection = null;
 
     var objects = RayConfig.octree ? this.octree.getIntersectionObjects(ray) : this.triangles;
+    //console.rlog("triangle intersection tests (before): " + objects.length);
+    objects = objects.filter (function (elem, pos) {
+        return objects.indexOf(elem) == pos;
+    });
+    //console.rlog("triangle intersection tests (after): " + objects.length);
     for (var i = 0; i < objects.length; i++) {
 
         var intersection = objects[i].intersects(ray);

src/objects/octree.js

@@ -63,6 +63,7 @@ Octree.prototype.loadOctree = function (objects) {
     }
 }
 
+// http://www.brandonpelfrey.com/blog/coding-a-simple-octree/
 Octree.prototype.insertObject = function (object) {
 
     if (this.depth >= RayConfig.octree_depth) {

src/raytracer.js

@@ -6,6 +6,11 @@ function intersect (ray) {
 
     // loop through all objects in the scene
     var objects = RayConfig.octree ? scene.octree.getIntersectionObjects(ray) : scene.objects;
+    //console.rlog("object intersection tests (before): " + objects.length);
+    objects = objects.filter (function (elem, pos) {
+        return objects.indexOf(elem) == pos;
+    });
+    //console.rlog("object intersection tests (after): " + objects.length);
     for (var i = 0; i < objects.length; i++) {
         // intersect with object -> returns distance
         var intersection = objects[i].intersects(ray);

src/scene/scene.js

@@ -5,7 +5,6 @@ var Scene = function (_globalAmbientIntensity) {
     this.camera = null;
 
     this.octree = new Octree(null, 0);
-    this.bounding = null;
 };
 
 Scene.prototype.addLight = function (_light) {
@@ -46,9 +45,7 @@ function loadScene() {
         loadA1();
     }
 
-    if (RayConfig.octree) {
-        scene.octree.loadOctree (scene.objects);
-    }
+    if (RayConfig.octree) scene.octree.loadOctree (scene.objects);
 
     console.log("scene loaded");
 }