merging with r29

This commit is contained in:
George Profenza
2010-11-30 13:45:00 +00:00
parent 774b5e843d
commit caf2c2000f
14 changed files with 146 additions and 330 deletions
Executable → Regular
+1 -1
View File
@@ -115,7 +115,7 @@ var BotArmL = function () {
scope.autoColor = function(){
for(var s in this.selections){
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [ new THREE.MeshColorFillMaterial( this.colors[s],1) ];
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [new THREE.MeshBasicMaterial({color:this.colors[s]})];
}
}
Executable → Regular
+1 -1
View File
@@ -143,7 +143,7 @@ var BotArmR = function () {
scope.autoColor = function(){
for(var s in this.selections){
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [ new THREE.MeshColorFillMaterial( this.colors[s],1) ];
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [new THREE.MeshBasicMaterial({color:this.colors[s]})];
}
}
+1 -1
View File
@@ -516,7 +516,7 @@ var BotLowerBody = function () {
scope.autoColor = function(){
for(var s in this.selections){
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [ new THREE.MeshColorFillMaterial( this.colors[s],1) ];
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [new THREE.MeshBasicMaterial({color:this.colors[s]})];
}
}
+1 -1
View File
@@ -873,7 +873,7 @@ var BotUpperBody = function () {
scope.autoColor = function(){
for(var s in this.selections){
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [ new THREE.MeshColorFillMaterial( this.colors[s],1) ];
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [new THREE.MeshBasicMaterial({color:this.colors[s]})];
}
}
+2 -2
View File
@@ -42,8 +42,8 @@ var Box6 = function () {
scope.colors["right"] = 0xb2b200;
scope.autoColor = function(){
for(var s in this.selections){
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [ new THREE.MeshColorFillMaterial( this.colors[s],1) ];
for(var s in this.selections){
for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [ new THREE.MeshBasicMaterial( { color: this.colors[s], wireframe: false } ) ];
}
}