tforgione/3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

It seems that the ProgressiveLoader is working

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-06-12 19:19:38 +02:00
parent a5a761de75
commit 9f6f3dccac
4 changed files with 99 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/ProgressiveLoader.js
View File

@@ -54,8 +54,6 @@ var ProgressiveLoader = function(path, scene, materialCreator, transparentElemen
elts[3]
));
verticesNeedUpdate = true;
} else if (elts[0] === 'vt') {
textCoords.push(new THREE.Vector2(
@@ -83,7 +81,7 @@ var ProgressiveLoader = function(path, scene, materialCreator, transparentElemen
}
// Add texture
if (elts.length === 7 || elts.length === 9) {
if (elts.length === 7) {
uvs.push([
textCoords[elts[4]],
textCoords[elts[5]],
@@ -91,6 +89,14 @@ var ProgressiveLoader = function(path, scene, materialCreator, transparentElemen
]);
}
if (elts.length === 9) {
uvs.push([
textCoords[elts[5]],
textCoords[elts[6]],
textCoords[elts[7]]
]);
}
if (elts.length === 9) {
uvs.push([
textCoords[elts[5]],
@@ -118,7 +124,8 @@ var ProgressiveLoader = function(path, scene, materialCreator, transparentElemen
} else {
material = materialCreator.materials[currentMaterial.trim()];
material.side = THREE.DoubleSide;
material.map.wrapS = material.map.wrapT = THREE.RepeatWrapping;
if (material.map)
material.map.wrapS = material.map.wrapT = THREE.RepeatWrapping;
currentMaterial = null;
}
@@ -130,8 +137,8 @@ var ProgressiveLoader = function(path, scene, materialCreator, transparentElemen
currentMesh.raycastable = true;
}
currentMesh.geometry.computeFaceNormals();
}
currentMesh.geometry.computeFaceNormals();
obj.add(currentMesh);
} else if (elts[0] === 'u') {

97
js/prototype/initScene.js vendored
View File

@@ -781,45 +781,66 @@ function initMountain(camera, scene, static_path, coins) {
}
function initSponzaScene(scene, collidableObjects, loader, static_path) {
var onProgress = function ( xhr ) {
if ( xhr.lengthComputable ) {
var percentComplete = xhr.loaded / xhr.total * 100;
console.log( Math.round(percentComplete, 2) + '% downloaded' );
}
};
loader.load(
static_path + './data/sponza/sponza.json',
function (geometry, materials) {
console.log("OK");
geometry.mergeVertices();
var material = new THREE.MeshFaceMaterial(materials);
var object = new THREE.Mesh(geometry, material);
object.scale.set(0.01,0.01,0.01);
object.raycastable = true;
collidableObjects.push(object);
// object.rotation.x = -Math.PI/2;
// object.rotation.z = Math.PI/2;
// collidableObjects.push(object);
// scene.add(object);
object.traverse(function (obj) {
if (obj instanceof THREE.Mesh) {
for (var i in obj.material.materials) {
var m = obj.material.materials[i].map;
if (m)
m.wrapS = m.wrapT = THREE.RepeatWrapping;
}
// obj.material.map.wrapS = obj.material.map.wrapT = THREE.RepeatWrapping;
}
// obj.geometry.mergeVertices();
// obj.geometry.computeVertexNormals();
// obj.material.side = THREE.DoubleSide;
// obj.raycastable = true;
// }
});
scene.add(object);
}
, onProgress, function(xhr) { console.log("error");});
var loader = new THREE.MTLLoader('/static/data/sponza/');
loader.load('/static/data/sponza/sponza.mtl', function(materialCreator) {
materialCreator.preload();
console.log("Starting loading...");
var mesh = ProgressiveLoader('static/data/sponza/sponza.obj', scene, materialCreator, [
'chain',
'leaf'
]);
// object.position.z -= 10.9;
// object.position.y += 0.555;
// object.position.x += 3.23;
mesh.scale.set(0.01,0.01,0.01);
mesh.raycastable = true;
collidableObjects.push(mesh);
});
// var onProgress = function ( xhr ) {
// if ( xhr.lengthComputable ) {
// var percentComplete = xhr.loaded / xhr.total * 100;
// console.log( Math.round(percentComplete, 2) + '% downloaded' );
// }
// };
// loader.load(
// static_path + './data/sponza/sponza.json',
// function (geometry, materials) {
// console.log("OK");
// geometry.mergeVertices();
// var material = new THREE.MeshFaceMaterial(materials);
// var object = new THREE.Mesh(geometry, material);
// object.scale.set(0.01,0.01,0.01);
// object.raycastable = true;
// collidableObjects.push(object);
// // object.rotation.x = -Math.PI/2;
// // object.rotation.z = Math.PI/2;
// // collidableObjects.push(object);
// // scene.add(object);
// object.traverse(function (obj) {
// if (obj instanceof THREE.Mesh) {
// for (var i in obj.material.materials) {
// var m = obj.material.materials[i].map;
// if (m)
// m.wrapS = m.wrapT = THREE.RepeatWrapping;
// }
// // obj.material.map.wrapS = obj.material.map.wrapT = THREE.RepeatWrapping;
// }
// // obj.geometry.mergeVertices();
// // obj.geometry.computeVertexNormals();
// // obj.material.side = THREE.DoubleSide;
// // obj.raycastable = true;
// // }
// });
// scene.add(object);
// }
// , onProgress, function(xhr) { console.log("error");});
}
function createSponzaCoins() {