Refactor #1

Author: tapanij

Diff for: Car.js

@@ -261,7 +261,7 @@ THREE.Car = function() {
 		// Ground collider
 		var raycaster = new THREE.Raycaster(new THREE.Vector3(this.root.position.x, this.root.position.y + 50, this.root.position.z), new THREE.Vector3(0, -1, 0), 0, 500);
 
-		var intersects = raycaster.intersectObject(colliderGround);
+		var intersects = raycaster.intersectObject(oulu.colliders[1]);
 
 		if (intersects.length > 0) {
 			// console.log("plane collision: " + intersects.length);
@@ -318,7 +318,7 @@ THREE.Car = function() {
 
 	function isColliding(position, focusX, focusZ) {
 		var raycaster = new THREE.Raycaster(position, new THREE.Vector3(focusX, 0, focusZ), 0, 4);
-		var intersects = raycaster.intersectObject(colliderBuildings);
+		var intersects = raycaster.intersectObject(oulu.colliders[0]);
 		if (intersects.length > 0) {
 			return true;
 		}

Diff for: GridManager.js renamed to Grid.js

@@ -2,6 +2,8 @@
  * @author Tapani Jämsä  ([email protected])
  */
 
+var GRID = {};
+
 GRID.Manager = function() {
 
 	this.target; // target to track e.g. a car or avatar
@@ -37,6 +39,51 @@ GRID.Manager = function() {
 	// };
 
 
+	// function isColliding(position, focusX, focusZ) {
+	// 	var raycaster = new THREE.Raycaster(position, new THREE.Vector3(focusX, 0, focusZ), 0, 4);
+	// 	var intersects = raycaster.intersectObject(colliderBuildings);
+	// 	if (intersects.length > 0) {
+	// 		return true;
+	// 	}
+	// 	return false;
+	// }
+};
+
+GRID.Block = function() {
+	
+	this.gridPosition = {
+		x: 0,
+		y: 0
+	};
+
+	this.mesh = null;
+	this.colliders = [];
+
+	// this.setMesh = function(newMesh){
+
+	// };
+
+	// this.setVisible = function(enable) {
+
+	// 	for (var i = 0; i < this.meshes.length; i++) {
+
+	// 		this.meshes[i].visible = enable;
+	// 		this.meshes[i].visible = enable;
+
+	// 	}
+
+	// };
+
+	// this.loadPartsJSON = function(bodyURL, wheelURL) {
+
+	// 	var loader = new THREE.JSONLoader();
+
+	// 	loader.load(bodyURL, createBody);
+	// 	// loader.load(wheelURL, createWheels);
+
+	// };
+
+
 	// function isColliding(position, focusX, focusZ) {
 	// 	var raycaster = new THREE.Raycaster(position, new THREE.Vector3(focusX, 0, focusZ), 0, 4);
 	// 	var intersects = raycaster.intersectObject(colliderBuildings);

Diff for: GridBlock.js

@@ -13,14 +13,16 @@ var flyMode = false;
 var keyboard = new THREEx.KeyboardState();
 var clock = new THREE.Clock();
 var time = Date.now();
-var car, oulu, colliderBuildings, colliderGround;
+var car;
+var oulu = new GRID.Block();
+var gridManager = new GRID.Manager();
 var ouluClones = [];
 var clonePosition = {
 	x: 0,
 	z: 0
 };
 var cloneOffset = 370;
-var cloneAmount = 1;
+var cloneAmount = 3;
 var debugMode = false;
 
 var controlsCar = {
@@ -119,6 +121,11 @@ function init() {
 	// CUSTOM //
 	////////////
 
+	// GRID
+
+
+	//JSON
+
 	// Note: if imported model appears too dark,
 	//   add an ambient light in this file
 	//   and increase values in model's exported .js file
@@ -260,8 +267,8 @@ function addModelToScene(geometry, materials, type) {
 			console.log("loading", realTextures.length, "textures");
 			var nchanged = 0;
 			for (var i = 0; i < realTextures.length; i++) {
-				// oulu.material.materials[i].map = loadTexture(realTextures[key]);
-				var m = oulu.material.materials[i];
+				// oulu.mesh.material.materials[i].map = loadTexture(realTextures[key]);
+				var m = oulu.mesh.material.materials[i];
 				if (m === undefined)
 					console.log("material", i, "was undefined");
 				else if (realTextures[i] !== undefined) {
@@ -275,12 +282,10 @@ function addModelToScene(geometry, materials, type) {
 		material = new THREE.MeshFaceMaterial(newMaterials);
 		newMesh = new THREE.Mesh(geometry, material);
 
-		if (oulu === undefined) {
-			oulu = newMesh;
+		if (oulu.mesh === undefined || oulu.mesh === null) {
+			oulu.mesh = newMesh;
 		} else {
 			clonePosition = getNextClonePosition(clonePosition);
-			// console.log("clonePosition: " + oulu);
-			// console.log(clonePosition);
 
 			newMesh.position.set(clonePosition.x * 500, 0, clonePosition.z * 500);
 			ouluClones.push(newMesh);
@@ -289,22 +294,22 @@ function addModelToScene(geometry, materials, type) {
 		}
 
 
-		// oulu.castShadow = true;
-		// oulu.receiveShadow = true;
+		// oulu.mesh.castShadow = true;
+		// oulu.mesh.receiveShadow = true;
 	} else if (type == "colliderbuildings") {
 		material = new THREE.MeshFaceMaterial(materials);
 		newMesh = new THREE.Mesh(geometry, material);
 		if (debugMode == false) {
 			newMesh.visible = false;
 		}
-		colliderBuildings = newMesh;
+		oulu.colliders[0] = newMesh;
 	} else if (type == "colliderground") {
 		material = new THREE.MeshFaceMaterial(materials);
 		newMesh = new THREE.Mesh(geometry, material);
 		if (debugMode == false) {
 			newMesh.visible = false;
 		}
-		colliderGround = newMesh;
+		oulu.colliders[1] = newMesh;
 	}
 
 	newMesh.scale.set(1.5, 1.5, 1.5);

Diff for: Oulu.js

@@ -19,6 +19,7 @@
 <script src="js/THREEx.FullScreen.js"></script>
 <script src="js/THREEx.WindowResize.js"></script>
 <script src="Car.js"></script>
+<script src="Grid.js"></script>
 <script src="js/jquery-1.9.1.js"></script>
 <script src="js/jquery-ui.js"></script>
 <link rel=stylesheet href="css/jquery-ui.css" />