Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Merge pull request #59 from jef79m/development

Browse source 
Texture and extension changes to new models.
This commit is contained in:
Stefan Kolla 2014-11-02 09:21:11 +01:00
commit c4122f1dc1
10 changed files with 1280 additions and 1344 deletions
Download patch file Download diff file Expand all files Collapse all files

0
resources/models/fallback.js → resources/models/fallback.json
View file

509
resources/models/hex_plus.js
View file

File diff suppressed because one or more lines are too long

477
resources/models/hex_plus.json Normal file
View file

File diff suppressed because one or more lines are too long

509
resources/models/hex_x.js
View file

File diff suppressed because one or more lines are too long

477
resources/models/hex_x.json Normal file
View file

File diff suppressed because one or more lines are too long

0
resources/models/quad_x.js → resources/models/quad_x.json
View file

98
resources/models/tricopter.js → resources/models/tricopter.json
View file

@ -75,15 +75,15 @@
"DbgColor" : 15597568, "DbgColor" : 15597568,
"DbgIndex" : 1, "DbgIndex" : 1,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -129,15 +129,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -183,15 +183,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -237,15 +237,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -291,15 +291,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -345,15 +345,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -399,15 +399,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false

112
resources/models/y4.js → resources/models/y4.json
View file

@ -21,15 +21,15 @@
"DbgColor" : 15658734, "DbgColor" : 15658734,
"DbgIndex" : 0, "DbgIndex" : 0,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -147,15 +147,15 @@
"DbgColor" : 15597568, "DbgColor" : 15597568,
"DbgIndex" : 1, "DbgIndex" : 1,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -201,15 +201,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -255,15 +255,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -309,15 +309,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -363,15 +363,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -417,15 +417,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -471,15 +471,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false

140
resources/models/y6.js → resources/models/y6.json
View file

@ -21,15 +21,15 @@
"DbgColor" : 15658734, "DbgColor" : 15658734,
"DbgIndex" : 0, "DbgIndex" : 0,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -111,15 +111,15 @@
"DbgColor" : 15597568, "DbgColor" : 15597568,
"DbgIndex" : 1, "DbgIndex" : 1,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -165,15 +165,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -291,15 +291,15 @@
"DbgColor" : 15597568, "DbgColor" : 15597568,
"DbgIndex" : 1, "DbgIndex" : 1,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -345,15 +345,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -399,15 +399,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -453,15 +453,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -507,15 +507,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -561,15 +561,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false
@ -615,15 +615,15 @@
"DbgColor" : 238, "DbgColor" : 238,
"DbgIndex" : 3, "DbgIndex" : 3,
"DbgName": "Material.001", "DbgName": "Material.001",
"blending" : "NormalBlending", "blending": "AdditiveBlending",
"colorAmbient" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorAmbient": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorDiffuse" : [0.024850824845594532, 0.024850824845594532, 0.024850824845594532], "colorDiffuse": [0.03882747395630792, 0.03882747395630792, 0.03882747395630792],
"colorEmissive" : [0.0, 0.0, 0.0], "colorEmissive": [0.0124247913883028, 0.0124247913883028, 0.0124247913883028],
"colorSpecular" : [0.22413793206214905, 0.22413793206214905, 0.22413793206214905], "colorSpecular": [0.16390721411171505, 0.16390721411171505, 0.16390721411171505],
"depthTest": true, "depthTest": true,
"depthWrite": true, "depthWrite": true,
"shading" : "Lambert", "shading": "Phong",
"specularCoef" : 50, "specularCoef": 18,
"transparency": 1.0, "transparency": 1.0,
"transparent": false, "transparent": false,
"vertexColors": false "vertexColors": false

2
tabs/setup.js
View file

@ -222,7 +222,7 @@ TABS.setup.initialize3D = function (compatibility) {
} }
loader = new THREE.JSONLoader(); loader = new THREE.JSONLoader();
loader.load('./resources/models/' + model_file + '.js', function (geometry, materials) { loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) {
if (!fallback) { if (!fallback) {
model = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials)); model = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials));
} else { } else {