Skip to content

Commit 1658d7f

Browse files
committed
Removed workers from Blender exporter.
Fixed Blender importer to work with Blender 2.60, add option for importing workers or non-worker models. Fixed more examples to use worker-less format. All examples should work now. Only Max exporter should be left to change.
1 parent 81a8eec commit 1658d7f

File tree

13 files changed

+255
-302
lines changed

13 files changed

+255
-302
lines changed

examples/models/animated/sittingBox.js

+16-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/obj/WaltHeadLo.js

+4-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+19-24
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
/*
2-
* File generated with Blender 2.56 Exporter
3-
* https://github.com/mrdoob/three.js/tree/master/utils/exporters/blender/
4-
*
5-
* vertices: 8
6-
* faces: 6
7-
* normals: 0
8-
* uvs: 0
9-
* colors: 0
10-
* materials: 1
11-
* edges: 0
12-
*
13-
*/
14-
15-
var model = {
16-
17-
"version" : 2,
18-
1+
{
2+
3+
"metadata" :
4+
{
5+
"formatVersion" : 3,
6+
"generatedBy" : "Blender 2.60 Exporter",
7+
"vertices" : 8,
8+
"faces" : 6,
9+
"normals" : 0,
10+
"colors" : 0,
11+
"uvs" : 0,
12+
"materials" : 1,
13+
"morphTargets" : 0
14+
},
15+
1916
"scale" : 1.000000,
20-
17+
2118
"materials": [ {
2219
"DbgColor" : 15658734,
2320
"DbgIndex" : 0,
2421
"DbgName" : "Material",
2522
"colorAmbient" : [0.0, 0.0, 0.0],
2623
"colorDiffuse" : [0.6400000190734865, 0.10179081114814892, 0.126246120426746],
2724
"colorSpecular" : [0.5, 0.5, 0.5],
25+
"shading" : "Lambert",
2826
"specularCoef" : 50,
2927
"transparency" : 1.0,
3028
"vertexColors" : false
@@ -40,11 +38,8 @@ var model = {
4038

4139
"uvs": [[]],
4240

43-
"faces": [3,0,1,2,3,0,3,4,7,6,5,0,3,0,4,5,1,0,3,1,5,6,2,0,3,2,6,7,3,0,3,4,0,3,7,0],
41+
"faces": [3,0,1,2,3,0,3,4,7,6,5,0,3,0,4,5,1,0,3,1,5,6,2,0,3,2,6,7,3,0,3,4,0,3,7,0]
4442

45-
"edges" : []
4643

47-
};
4844

49-
postMessage( model );
50-
close();
45+
}

examples/obj/blenderscene/scene.Monkey.js

+19-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+19-24
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
/*
2-
* File generated with Blender 2.56 Exporter
3-
* https://github.com/mrdoob/three.js/tree/master/utils/exporters/blender/
4-
*
5-
* vertices: 4
6-
* faces: 1
7-
* normals: 0
8-
* uvs: 0
9-
* colors: 0
10-
* materials: 1
11-
* edges: 0
12-
*
13-
*/
14-
15-
var model = {
16-
17-
"version" : 2,
18-
1+
{
2+
3+
"metadata" :
4+
{
5+
"formatVersion" : 3,
6+
"generatedBy" : "Blender 2.60 Exporter",
7+
"vertices" : 4,
8+
"faces" : 1,
9+
"normals" : 0,
10+
"colors" : 0,
11+
"uvs" : 0,
12+
"materials" : 1,
13+
"morphTargets" : 0
14+
},
15+
1916
"scale" : 1.000000,
20-
17+
2118
"materials": [ {
2219
"DbgColor" : 15658734,
2320
"DbgIndex" : 0,
2421
"DbgName" : "Material.001",
2522
"colorAmbient" : [0.0, 0.0, 0.0],
2623
"colorDiffuse" : [0.14462547517754842, 0.6400000190734865, 0.24541190036254967],
2724
"colorSpecular" : [0.5, 0.5, 0.5],
25+
"shading" : "Lambert",
2826
"specularCoef" : 50,
2927
"transparency" : 1.0,
3028
"vertexColors" : false
@@ -40,11 +38,8 @@ var model = {
4038

4139
"uvs": [[]],
4240

43-
"faces": [3,0,3,2,1,0],
41+
"faces": [3,0,3,2,1,0]
4442

45-
"edges" : []
4643

47-
};
4844

49-
postMessage( model );
50-
close();
45+
}

0 commit comments

Comments
 (0)