Merge branch 'master' of https://gitlab.com/echo_avis_de_template/WebGL_Sites_Project

assets/Bane_3.mtl

@@ -0,0 +1,82 @@
+# 
+# 
+
+newmtl Bane3Chest
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Chest_D.tga
+
+newmtl Bane3Coverlid
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Stuff_D.tga
+
+newmtl Bane3Eyes
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Eye_D.tga
+
+newmtl Bane3Head
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Head_D.tga
+
+newmtl Bane3Mouth
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Mouth_D.tga
+
+newmtl Bane3Pants
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Pants_D.tga
+
+newmtl Bane3Pipes
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Stuff_D.tga
+
+newmtl Bane3Stuff
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd Bane3_Stuff_D.tga

scripts/demo.js

@@ -67,11 +67,12 @@ function runDemo(canvasId) {
 }
 
 function createObj(loader,scene){
-	var batman = loader.addMeshTask("bunny", "", "assets/", "bunny.obj");
+	var batman = loader.addMeshTask("bunny", "", "assets/", "Bane_3.obj");
 	batman.onSuccess = function(t){
-		t.loadedMeshes.forEach(function(m) {
+		t.loadedMeshes.forEach(function(m) {//m = model
             m.position.x = 10;
-						m.scale = 100;
+						m.scaling = new BABYLON.Vector3(1, 1, 1);
+						m.checkCollisions = true;
         });
 	};
 }
@@ -91,7 +92,7 @@ function createSkybox(scene) {
 
 
 function createDemoScene(scene) {
-	
+
 	// Cr<43>ation d'un sol
 
 	var groundMaterial = new BABYLON.StandardMaterial("ground", scene);
@@ -247,7 +248,7 @@ function createDemoScene(scene) {
 	groundSalle3.rotation.x = Math.PI / 2;
 	groundSalle3.position.z = 140;
 	groundSalle3.material = new BABYLON.StandardMaterial("gMaterial", scene);
-	groundSalle3.material = groundMaterial;	
+	groundSalle3.material = groundMaterial;
 	groundSalle3.checkCollisions = true;
 
 	var mur11Salle3 = BABYLON.Mesh.CreatePlane("mur11Salle3", 20, scene);