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

A lot of cleaning... jshint likes me now !

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-07-01 10:14:15 +02:00
parent 0af40f3484
commit fab183eaa7
68 changed files with 544 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
geo/Mesh.js
View File

@@ -12,7 +12,7 @@ geo.Mesh = function() {
this.material = null;
this.started = false;
this.finished = false;
}
};
/**
* Checks if there are normals in the mesh
@@ -20,7 +20,7 @@ geo.Mesh = function() {
*/
geo.Mesh.prototype.hasNormals = function() {
return this.normals.length > 0;
}
};
/**
* Checks if there are texture coordinates in the mesh
@@ -28,7 +28,7 @@ geo.Mesh.prototype.hasNormals = function() {
*/
geo.Mesh.prototype.hasTexCoords = function() {
return this.texCoords.length > 0;
}
};
/**
* Adds a vertex to a mesh
@@ -46,7 +46,7 @@ geo.Mesh.prototype.addVertex = function(vertex) {
}
return this.vertices[this.vertices.length - 1];
}
};
/**
* Adds a face to a mesh
@@ -70,7 +70,7 @@ geo.Mesh.prototype.addFaces = function(face) {
} else {
return faces;
}
}
};
/**
* Adds a texture coordinate to a mesh
@@ -87,7 +87,7 @@ geo.Mesh.prototype.addTexCoord = function(texCoord) {
}
return this.texCoords[this.texCoords.length - 1];
}
};
/**
* Adds a normal to a mesh
@@ -104,11 +104,11 @@ geo.Mesh.prototype.addNormal = function(normal) {
}
return this.normals[this.normals.length - 1];
}
};
geo.Mesh.prototype.isFinished = function() {
return this.faceIndex === this.faces.length;
}
};
/**
* Represent a 3D vertex
@@ -143,7 +143,7 @@ geo.Vertex = function() {
* @type {Boolean}
*/
this.sent = false;
}
};
/**
* Gives a list representation of the vertex
@@ -156,7 +156,7 @@ geo.Vertex = function() {
*/
geo.Vertex.prototype.toList = function() {
return ['v', this.index, this.x, this.y, this.z];
}
};
/**
* Gives a string representation of the vertex
@@ -168,7 +168,7 @@ geo.Vertex.prototype.toList = function() {
*/
geo.Vertex.prototype.toString = function() {
return 'v ' + this.x + ' ' + this.y + ' ' + this.z;
}
};
/**
* Represent a 3D normal
@@ -178,7 +178,7 @@ geo.Vertex.prototype.toString = function() {
*/
geo.Normal = function() {
geo.Vertex.apply(this, arguments);
}
};
geo.Normal.prototype = Object.create(geo.Vertex.prototype);
geo.Normal.prototype.constructor = geo.Normal;
@@ -196,7 +196,7 @@ geo.Normal.prototype.toList = function() {
var superObject = geo.Vertex.prototype.toList.call(this);
superObject[0] = 'vn';
return superObject;
}
};
/**
* Gives a string representation of the normal
@@ -210,7 +210,7 @@ geo.Normal.prototype.toString = function() {
var superObject = geo.Vertex.prototype.toString.call(this);
superObject.replace('v', 'vn');
return superObject;
}
};
/**
* Represent a texture coordinate element
@@ -239,7 +239,7 @@ geo.TexCoord = function() {
* @type {Boolean}
*/
this.sent = false;
}
};
/**
* Gives a list representation of the texture coordinate
@@ -252,7 +252,7 @@ geo.TexCoord = function() {
*/
geo.TexCoord.prototype.toList = function() {
return ['vt', this.index, this.x, this.y];
}
};
/**
* Gives a string representation of the texture coordinate
@@ -264,7 +264,7 @@ geo.TexCoord.prototype.toList = function() {
*/
geo.TexCoord.prototype.toString = function() {
return 'vt ' + this.x + ' ' + this.y;
}
};
/**
@@ -273,17 +273,18 @@ geo.TexCoord.prototype.toString = function() {
* @memberOf geo
*/
geo.Face = function() {
var split;
if (typeof arguments[0] === 'string' || arguments[0] instanceof String) {
if (arguments[0].indexOf('/') === -1) {
// No / : easy win : "f 1 2 3" or "f 1 2 3 4"
var split = arguments[0].replace(/\s+/g, ' ').split(' ');
split = arguments[0].replace(/\s+/g, ' ').split(' ');
this.a = parseInt(split[1]) - 1;
this.b = parseInt(split[2]) - 1;
this.c = parseInt(split[3]) - 1;
} else {
// There might be textures coords
var split = arguments[0].replace(/\s+/g, ' ').trim().split(' ');
split = arguments[0].replace(/\s+/g, ' ').trim().split(' ');
// Split elements
var split1 = split[1].split('/');
@@ -357,7 +358,7 @@ geo.Face = function() {
*/
this.sent = false;
}
};
/**
* Parse a face line and returns an array of faces
@@ -390,7 +391,7 @@ var parseFace = function(arg) {
}
return ret;
}
};
/**
* Returns the max index of the vertices of the face
@@ -402,7 +403,7 @@ geo.Face.prototype.max = function() {
} else {
return Math.max(this.a, this.b, this.c);
}
}
};
/**
* Returns the max index of the texture coordinates of the face
@@ -414,7 +415,7 @@ geo.Face.prototype.maxTexture = function() {
} else {
return Math.max(this.aTexture, this.bTexture, this.cTexture);
}
}
};
/**
* Gives a list representation of the face
@@ -452,7 +453,7 @@ geo.Face.prototype.toList = function() {
// l.push(this.dTexture);
return l;
}
};
/**
* Gives a string representation of the face
@@ -464,7 +465,7 @@ geo.Face.prototype.toList = function() {
*/
geo.Face.prototype.toString = function() {
return 'f ' + this.a + ' ' + this.b + ' ' + this.c + (this.d !== undefined ? ' ' + this.d : '');
}
};
/**
* Represents a material name
@@ -480,7 +481,7 @@ geo.Material = function() {
* @type {string}
*/
this.name = split[1];
}
};
/**
* Gives a string representation of the material
@@ -488,7 +489,7 @@ geo.Material = function() {
*/
geo.Material.prototype.toString = function() {
return 'usemtl ' + this.name;
}
};
/**
* Gives a list representation of the material
@@ -499,5 +500,5 @@ geo.Material.prototype.toString = function() {
*/
geo.Material.prototype.toList = function() {
return ['u', this.name];
}
};

4
geo/MeshContainer.js
View File

@@ -42,7 +42,7 @@ geo.MeshContainer = function(path) {
}
}
};
/**
* Loads a obj file
@@ -133,7 +133,7 @@ geo.MeshContainer.prototype.loadFromFile = function(path) {
}
}
};
var availableMeshNames = [
'/static/data/castle/princess peaches castle (outside).obj',

26
geo/MeshStreamer.js
View File

@@ -95,7 +95,7 @@ geo.MeshStreamer = function(path) {
}
}
};
/**
* Compute a function that can compare two faces
@@ -145,7 +145,7 @@ geo.MeshStreamer.prototype.faceComparator = function(camera) {
x: (self.vertices[face2.a].x + self.vertices[face2.b].x + self.vertices[face2.b].x) / 3,
y: (self.vertices[face2.a].y + self.vertices[face2.b].y + self.vertices[face2.b].y) / 3,
z: (self.vertices[face2.a].z + self.vertices[face2.b].z + self.vertices[face2.b].z) / 3
}
};
var dir2 = {
x: center2.x - camera.position.x,
@@ -170,8 +170,8 @@ geo.MeshStreamer.prototype.faceComparator = function(camera) {
}
return 0;
}
}
};
};
/**
* Initialize the socket.io callback
@@ -243,7 +243,7 @@ geo.MeshStreamer.prototype.start = function(socket) {
}
});
}
};
/**
* Prepare the array of materials
@@ -271,7 +271,7 @@ geo.MeshStreamer.prototype.nextMaterials = function() {
return data;
}
};
/**
* Prepare the next elements
@@ -281,6 +281,8 @@ geo.MeshStreamer.prototype.nextMaterials = function() {
*/
geo.MeshStreamer.prototype.nextElements = function(_camera, force) {
var i;
if (force === undefined) {
force = false;
@@ -305,9 +307,9 @@ geo.MeshStreamer.prototype.nextElements = function(_camera, force) {
y: _camera[1][1],
z: _camera[1][2]
}
}
};
for (var i = 2; i < _camera.length; i++) {
for (i = 2; i < _camera.length; i++) {
planes.push({
normal: {
@@ -325,7 +327,7 @@ geo.MeshStreamer.prototype.nextElements = function(_camera, force) {
x: camera.target.x - camera.position.x,
y: camera.target.y - camera.position.y,
z: camera.target.z - camera.position.z
}
};
}
@@ -400,7 +402,7 @@ geo.MeshStreamer.prototype.nextElements = function(_camera, force) {
var exitToContinue = false;
threeVertices = [vertex1, vertex2, vertex3];
for (var i = 0; i < threeVertices.length; i++) {
for (i = 0; i < threeVertices.length; i++) {
var vertex = threeVertices[i];
@@ -530,10 +532,10 @@ geo.MeshStreamer.prototype.nextElements = function(_camera, force) {
return {data: data, finished: mightBeCompletetlyFinished};
}
};
geo.MeshStreamer.prototype.isFinished = function(i) {
return this.meshFaces[i].counter === this.meshFaces[i].array.length;
}
};