Skip to content

Commit f9f0d0b

Browse files
vidartfvidartf
authored
Merge pull request #145 from vidartf/r88
Update threejs to r88
2 parents aef600c + c2fd7e6 commit f9f0d0b

File tree

2 files changed

+40
-42
lines changed

2 files changed

+40
-42
lines changed

‎js/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
"prepublish": "npm run autogen && npm run build"
2020
},
2121
"devDependencies": {
22-
"eslint": "^4.11.0",
23-
"fs-extra": "^4.0.2",
22+
"eslint": "^4.13.1",
23+
"fs-extra": "^5.0.0",
2424
"glob": "^7.1.2",
2525
"handlebars": "^4.0.11",
2626
"rimraf": "^2.6.2",
27-
"webpack": "^3.8.1"
27+
"webpack": "^3.10.0"
2828
},
2929
"dependencies": {
30-
"@jupyter-widgets/base": "^1.1.4",
30+
"@jupyter-widgets/base": "^1.1.5",
3131
"bluebird": "^3.5.1",
3232
"jupyter-dataserializers": "^1.0.0",
33-
"three": "^0.87.1",
33+
"three": "^0.88.0",
3434
"underscore": "^1.8.3"
3535
}
3636
}

‎js/scripts/three-class-config.js

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,6 @@ module.exports = {
443443
Uniform: {
444444
relativePath: './core/Uniform',
445445
},
446-
CurveUtils: {
447-
relativePath: './extras/CurveUtils',
448-
},
449446
SceneUtils: {
450447
relativePath: './extras/SceneUtils',
451448
},
@@ -1164,6 +1161,7 @@ module.exports = {
11641161
unpackAlignment: new Types.Int(4), // from three docs: valid values: 1, 2, 4, 8 (see http://www.khronos.org/opengles/sdk/docs/man/xhtml/glPixelStorei.xml)
11651162
encoding: new Types.Enum('TextureEncodings', 'LinearEncoding'),
11661163
version: new Types.Int(0),
1164+
rotation: new Types.Float(0),
11671165
},
11681166
// As the image property is not exposed, we don't define constructorArgs.
11691167
// The image property is hidden, as it does not have a good corresponding python type (yet)
@@ -1325,9 +1323,9 @@ module.exports = {
13251323
superClass: 'BaseBufferGeometry',
13261324
constructorArgs: [ 'width', 'height', 'depth', 'widthSegments', 'heightSegments', 'depthSegments' ],
13271325
properties: {
1328-
width: new Types.Float(10.0),
1329-
height: new Types.Float(10.0),
1330-
depth: new Types.Float(10.0),
1326+
width: new Types.Float(1.0),
1327+
height: new Types.Float(1.0),
1328+
depth: new Types.Float(1.0),
13311329
widthSegments: new Types.Int(1),
13321330
heightSegments: new Types.Int(1),
13331331
depthSegments: new Types.Int(1),
@@ -1338,9 +1336,9 @@ module.exports = {
13381336
superClass: 'BaseGeometry',
13391337
constructorArgs: [ 'width', 'height', 'depth', 'widthSegments', 'heightSegments', 'depthSegments' ],
13401338
properties: {
1341-
width: new Types.Float(10.0),
1342-
height: new Types.Float(10.0),
1343-
depth: new Types.Float(10.0),
1339+
width: new Types.Float(1.0),
1340+
height: new Types.Float(1.0),
1341+
depth: new Types.Float(1.0),
13441342
widthSegments: new Types.Int(1),
13451343
heightSegments: new Types.Int(1),
13461344
depthSegments: new Types.Int(1),
@@ -1351,7 +1349,7 @@ module.exports = {
13511349
superClass: 'BaseBufferGeometry',
13521350
constructorArgs: [ 'radius', 'segments', 'thetaStart', 'thetaLength' ],
13531351
properties: {
1354-
radius: new Types.Float(50.0),
1352+
radius: new Types.Float(1.0),
13551353
segments: new Types.Int(8, {minValue: 3}),
13561354
thetaStart: new Types.Float(0.0),
13571355
thetaLength: new Types.Float(Math.PI * 2.0),
@@ -1362,7 +1360,7 @@ module.exports = {
13621360
superClass: 'BaseGeometry',
13631361
constructorArgs: [ 'radius', 'segments', 'thetaStart', 'thetaLength' ],
13641362
properties: {
1365-
radius: new Types.Float(50.0),
1363+
radius: new Types.Float(1.0),
13661364
segments: new Types.Int(8, {minValue: 3}),
13671365
thetaStart: new Types.Float(0.0),
13681366
thetaLength: new Types.Float(Math.PI * 2.0),
@@ -1387,9 +1385,9 @@ module.exports = {
13871385
superClass: 'BaseBufferGeometry',
13881386
constructorArgs: [ 'radiusTop', 'radiusBottom', 'height', 'radiusSegments', 'heightSegments', 'openEnded', 'thetaStart', 'thetaLength' ],
13891387
properties: {
1390-
radiusTop: new Types.Float(20.0),
1391-
radiusBottom: new Types.Float(20.0),
1392-
height: new Types.Float(100.0),
1388+
radiusTop: new Types.Float(1.0),
1389+
radiusBottom: new Types.Float(1.0),
1390+
height: new Types.Float(1.0),
13931391
radiusSegments: new Types.Int(8),
13941392
heightSegments: new Types.Int(1),
13951393
openEnded: new Types.Bool(false),
@@ -1402,9 +1400,9 @@ module.exports = {
14021400
superClass: 'BaseGeometry',
14031401
constructorArgs: [ 'radiusTop', 'radiusBottom', 'height', 'radiusSegments', 'heightSegments', 'openEnded', 'thetaStart', 'thetaLength' ],
14041402
properties: {
1405-
radiusTop: new Types.Float(20.0),
1406-
radiusBottom: new Types.Float(20.0),
1407-
height: new Types.Float(100.0),
1403+
radiusTop: new Types.Float(1.0),
1404+
radiusBottom: new Types.Float(1.0),
1405+
height: new Types.Float(1.0),
14081406
radiusSegments: new Types.Int(8),
14091407
heightSegments: new Types.Int(1),
14101408
openEnded: new Types.Bool(false),
@@ -1486,8 +1484,8 @@ module.exports = {
14861484
superClass: 'BaseBufferGeometry',
14871485
constructorArgs: [ 'width', 'height', 'widthSegments', 'heightSegments' ],
14881486
properties: {
1489-
width: new Types.Float(10.0), // NOTE: default not specified in three.js
1490-
height: new Types.Float(10.0), // NOTE: default not specified in three.js
1487+
width: new Types.Float(1.0),
1488+
height: new Types.Float(1.0),
14911489
widthSegments: new Types.Int(1),
14921490
heightSegments: new Types.Int(1),
14931491
},
@@ -1497,8 +1495,8 @@ module.exports = {
14971495
superClass: 'BaseGeometry',
14981496
constructorArgs: [ 'width', 'height', 'widthSegments', 'heightSegments' ],
14991497
properties: {
1500-
width: new Types.Float(10.0), // NOTE: default not specified in three.js
1501-
height: new Types.Float(10.0), // NOTE: default not specified in three.js
1498+
width: new Types.Float(1.0),
1499+
height: new Types.Float(1.0),
15021500
widthSegments: new Types.Int(1),
15031501
heightSegments: new Types.Int(1),
15041502
},
@@ -1520,8 +1518,8 @@ module.exports = {
15201518
superClass: 'BaseBufferGeometry',
15211519
constructorArgs: [ 'innerRadius', 'outerRadius', 'thetaSegments', 'phiSegments', 'thetaStart', 'thetaLength' ],
15221520
properties: {
1523-
innerRadius: new Types.Float(0.0), // Docs: "Default is 0, but it doesn't work right when innerRadius is set to 0.
1524-
outerRadius: new Types.Float(50.0),
1521+
innerRadius: new Types.Float(0.5),
1522+
outerRadius: new Types.Float(1.0),
15251523
thetaSegments: new Types.Int(8, {minValue: 3}),
15261524
phiSegments: new Types.Int(8, {minValue: 1}),
15271525
thetaStart: new Types.Float(0),
@@ -1533,8 +1531,8 @@ module.exports = {
15331531
superClass: 'BaseGeometry',
15341532
constructorArgs: [ 'innerRadius', 'outerRadius', 'thetaSegments', 'phiSegments', 'thetaStart', 'thetaLength' ],
15351533
properties: {
1536-
innerRadius: new Types.Float(0.0), // Docs: "Default is 0, but it doesn't work right when innerRadius is set to 0.
1537-
outerRadius: new Types.Float(50.0),
1534+
innerRadius: new Types.Float(0.5),
1535+
outerRadius: new Types.Float(1.0),
15381536
thetaSegments: new Types.Int(8, {minValue: 3}),
15391537
phiSegments: new Types.Int(8, {minValue: 1}),
15401538
thetaStart: new Types.Float(0),
@@ -1558,7 +1556,7 @@ module.exports = {
15581556
superClass: 'BaseBufferGeometry',
15591557
constructorArgs: [ 'radius', 'widthSegments', 'heightSegments', 'phiStart', 'phiLength', 'thetaStart', 'thetaLength' ],
15601558
properties: {
1561-
radius: new Types.Float(50.0),
1559+
radius: new Types.Float(1.0),
15621560
widthSegments: new Types.Int(8),
15631561
heightSegments: new Types.Int(6),
15641562
phiStart: new Types.Float(0),
@@ -1572,7 +1570,7 @@ module.exports = {
15721570
superClass: 'BaseGeometry',
15731571
constructorArgs: [ 'radius', 'widthSegments', 'heightSegments', 'phiStart', 'phiLength', 'thetaStart', 'thetaLength' ],
15741572
properties: {
1575-
radius: new Types.Float(50.0),
1573+
radius: new Types.Float(1.0),
15761574
widthSegments: new Types.Int(8),
15771575
heightSegments: new Types.Int(6),
15781576
phiStart: new Types.Float(0),
@@ -1600,8 +1598,8 @@ module.exports = {
16001598
superClass: 'BaseBufferGeometry',
16011599
constructorArgs: [ 'radius', 'tube', 'radialSegments', 'tubularSegments', 'arc' ],
16021600
properties: {
1603-
radius: new Types.Float(100),
1604-
tube: new Types.Float(40),
1601+
radius: new Types.Float(1.0),
1602+
tube: new Types.Float(0.4),
16051603
radialSegments: new Types.Int(8),
16061604
tubularSegments: new Types.Int(6),
16071605
arc: new Types.Float(Math.PI * 2.0),
@@ -1612,8 +1610,8 @@ module.exports = {
16121610
superClass: 'BaseGeometry',
16131611
constructorArgs: [ 'radius', 'tube', 'radialSegments', 'tubularSegments', 'arc' ],
16141612
properties: {
1615-
radius: new Types.Float(100),
1616-
tube: new Types.Float(40),
1613+
radius: new Types.Float(1.0),
1614+
tube: new Types.Float(0.4),
16171615
radialSegments: new Types.Int(8),
16181616
tubularSegments: new Types.Int(6),
16191617
arc: new Types.Float(Math.PI * 2.0),
@@ -1624,8 +1622,8 @@ module.exports = {
16241622
superClass: 'BaseBufferGeometry',
16251623
constructorArgs: [ 'radius', 'tube', 'tubularSegments', 'radialSegments', 'p', 'q' ],
16261624
properties: {
1627-
radius: new Types.Float(100),
1628-
tube: new Types.Float(40),
1625+
radius: new Types.Float(1.0),
1626+
tube: new Types.Float(0.4),
16291627
tubularSegments: new Types.Int(64),
16301628
radialSegments: new Types.Int(8),
16311629
p: new Types.Int(2),
@@ -1637,8 +1635,8 @@ module.exports = {
16371635
superClass: 'BaseGeometry',
16381636
constructorArgs: [ 'radius', 'tube', 'tubularSegments', 'radialSegments', 'p', 'q' ],
16391637
properties: {
1640-
radius: new Types.Float(100),
1641-
tube: new Types.Float(40),
1638+
radius: new Types.Float(1),
1639+
tube: new Types.Float(0.4),
16421640
tubularSegments: new Types.Int(64),
16431641
radialSegments: new Types.Int(8),
16441642
p: new Types.Int(2),
@@ -1677,8 +1675,8 @@ module.exports = {
16771675
headWidth: new Types.Float(null, {nullable: true}),
16781676
},
16791677
},
1680-
AxisHelper: {
1681-
relativePath: './helpers/AxisHelper',
1678+
AxesHelper: {
1679+
relativePath: './helpers/AxesHelper',
16821680
superClass: 'Object3D', // Should really be LineSegments, but we don't want to sync geometry/material
16831681
properties: {
16841682
size: new Types.Float(1.0),

0 commit comments

Comments
 (0)