Skip to content

Commit 6b9b900

Browse files
abelnationabelnation
committed
temp fix for regular Geometry shapes
1 parent 7d9b2ee commit 6b9b900

File tree

406 files changed

+442
-440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+442
-440
lines changed

‎examples/Geometries.ipynb

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"cell_type": "code",
52-
"execution_count": null,
52+
"execution_count": 4,
5353
"metadata": {
5454
"collapsed": true
5555
},
@@ -64,7 +64,7 @@
6464
},
6565
{
6666
"cell_type": "code",
67-
"execution_count": 4,
67+
"execution_count": 5,
6868
"metadata": {
6969
"collapsed": true
7070
},
@@ -79,7 +79,7 @@
7979
},
8080
{
8181
"cell_type": "code",
82-
"execution_count": null,
82+
"execution_count": 6,
8383
"metadata": {
8484
"collapsed": true
8585
},
@@ -98,7 +98,7 @@
9898
},
9999
{
100100
"cell_type": "code",
101-
"execution_count": null,
101+
"execution_count": 7,
102102
"metadata": {
103103
"collapsed": true
104104
},
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"cell_type": "code",
120-
"execution_count": null,
120+
"execution_count": 8,
121121
"metadata": {
122122
"collapsed": false
123123
},
@@ -128,7 +128,7 @@
128128
},
129129
{
130130
"cell_type": "code",
131-
"execution_count": null,
131+
"execution_count": 9,
132132
"metadata": {
133133
"collapsed": true
134134
},
@@ -140,7 +140,7 @@
140140
},
141141
{
142142
"cell_type": "code",
143-
"execution_count": null,
143+
"execution_count": 10,
144144
"metadata": {
145145
"collapsed": true
146146
},
@@ -152,7 +152,7 @@
152152
},
153153
{
154154
"cell_type": "code",
155-
"execution_count": null,
155+
"execution_count": 11,
156156
"metadata": {
157157
"collapsed": true
158158
},
@@ -163,7 +163,7 @@
163163
},
164164
{
165165
"cell_type": "code",
166-
"execution_count": null,
166+
"execution_count": 12,
167167
"metadata": {
168168
"collapsed": false
169169
},
@@ -183,7 +183,7 @@
183183
},
184184
{
185185
"cell_type": "code",
186-
"execution_count": null,
186+
"execution_count": 13,
187187
"metadata": {
188188
"collapsed": true
189189
},
@@ -194,7 +194,7 @@
194194
},
195195
{
196196
"cell_type": "code",
197-
"execution_count": null,
197+
"execution_count": 14,
198198
"metadata": {
199199
"collapsed": true
200200
},
@@ -212,7 +212,7 @@
212212
},
213213
{
214214
"cell_type": "code",
215-
"execution_count": null,
215+
"execution_count": 15,
216216
"metadata": {
217217
"collapsed": true
218218
},
@@ -227,7 +227,7 @@
227227
},
228228
{
229229
"cell_type": "code",
230-
"execution_count": null,
230+
"execution_count": 16,
231231
"metadata": {
232232
"collapsed": true
233233
},
@@ -242,7 +242,7 @@
242242
},
243243
{
244244
"cell_type": "code",
245-
"execution_count": null,
245+
"execution_count": 17,
246246
"metadata": {
247247
"collapsed": true
248248
},
@@ -254,7 +254,7 @@
254254
},
255255
{
256256
"cell_type": "code",
257-
"execution_count": null,
257+
"execution_count": 18,
258258
"metadata": {
259259
"collapsed": true
260260
},
@@ -272,7 +272,7 @@
272272
},
273273
{
274274
"cell_type": "code",
275-
"execution_count": null,
275+
"execution_count": 19,
276276
"metadata": {
277277
"collapsed": true
278278
},
@@ -290,7 +290,7 @@
290290
},
291291
{
292292
"cell_type": "code",
293-
"execution_count": null,
293+
"execution_count": 20,
294294
"metadata": {
295295
"collapsed": true
296296
},
@@ -302,7 +302,7 @@
302302
},
303303
{
304304
"cell_type": "code",
305-
"execution_count": null,
305+
"execution_count": 21,
306306
"metadata": {
307307
"collapsed": true
308308
},
@@ -320,7 +320,7 @@
320320
},
321321
{
322322
"cell_type": "code",
323-
"execution_count": 5,
323+
"execution_count": 22,
324324
"metadata": {
325325
"collapsed": true
326326
},
@@ -338,7 +338,7 @@
338338
},
339339
{
340340
"cell_type": "code",
341-
"execution_count": null,
341+
"execution_count": 23,
342342
"metadata": {
343343
"collapsed": true
344344
},
@@ -349,7 +349,7 @@
349349
},
350350
{
351351
"cell_type": "code",
352-
"execution_count": null,
352+
"execution_count": 24,
353353
"metadata": {
354354
"collapsed": true
355355
},
@@ -361,7 +361,7 @@
361361
},
362362
{
363363
"cell_type": "code",
364-
"execution_count": null,
364+
"execution_count": 25,
365365
"metadata": {
366366
"collapsed": true
367367
},
@@ -377,7 +377,7 @@
377377
},
378378
{
379379
"cell_type": "code",
380-
"execution_count": null,
380+
"execution_count": 26,
381381
"metadata": {
382382
"collapsed": true
383383
},
@@ -393,7 +393,7 @@
393393
},
394394
{
395395
"cell_type": "code",
396-
"execution_count": null,
396+
"execution_count": 27,
397397
"metadata": {
398398
"collapsed": true
399399
},
@@ -410,7 +410,7 @@
410410
},
411411
{
412412
"cell_type": "code",
413-
"execution_count": null,
413+
"execution_count": 28,
414414
"metadata": {
415415
"collapsed": true
416416
},
@@ -427,7 +427,7 @@
427427
},
428428
{
429429
"cell_type": "code",
430-
"execution_count": null,
430+
"execution_count": 29,
431431
"metadata": {
432432
"collapsed": false
433433
},
@@ -444,7 +444,7 @@
444444
},
445445
{
446446
"cell_type": "code",
447-
"execution_count": null,
447+
"execution_count": 30,
448448
"metadata": {
449449
"collapsed": true
450450
},

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,16 @@ module.exports = {
149149
Geometry: {
150150
relativePath: './core/Geometry',
151151
properties: {
152+
id: new Types.String(''),
152153
uuid: new Types.String(''),
153154
name: new Types.String(''),
154155
type: new Types.String(''),
155156

156157
// TODO: arrays of geometry data
157-
vertices: new Types.VectorArray(),
158-
faces: new Types.FaceArray(),
158+
// vertices: new Types.VectorArray(),
159+
// colors: new Types.ColorArray(),
160+
161+
// faces: new Types.FaceArray(),
159162
},
160163
propsDefinedByThree: [ 'uuid', 'type' ]
161164
},

‎js/src/_base/Three.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,8 @@ var ThreeModel = widgets.DOMWidgetModel.extend({
999999
var result;
10001000
if (cached) {
10011001
result = cached;
1002+
1003+
// TODO: currently array and itemsize cannot be changed
10021004
// result.array = new Float32Array(ba[0]);
10031005
// result.itemSize = ba[1];
10041006
} else {

‎js/src/_base/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// This file auto-generated with generate-wrappers.js
3-
// Date: Fri Oct 21 2016 15:59:19 GMT-0700 (PDT)
3+
// Date: Fri Oct 21 2016 17:17:08 GMT-0700 (PDT)
44
//
55
// Load all three.js python wrappers
66
var loadedModules = [

‎js/src/animation/AnimationClip.autogen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// This file auto-generated with generate-wrappers.js
3-
// Date: Fri Oct 21 2016 15:59:18 GMT-0700 (PDT)
3+
// Date: Fri Oct 21 2016 17:17:07 GMT-0700 (PDT)
44
//
55

66
var _ = require('underscore');

‎js/src/animation/AnimationMixer.autogen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// This file auto-generated with generate-wrappers.js
3-
// Date: Fri Oct 21 2016 15:59:18 GMT-0700 (PDT)
3+
// Date: Fri Oct 21 2016 17:17:07 GMT-0700 (PDT)
44
//
55

66
var _ = require('underscore');

‎js/src/animation/AnimationObjectGroup.autogen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// This file auto-generated with generate-wrappers.js
3-
// Date: Fri Oct 21 2016 15:59:18 GMT-0700 (PDT)
3+
// Date: Fri Oct 21 2016 17:17:07 GMT-0700 (PDT)
44
//
55

66
var _ = require('underscore');

‎js/src/animation/AnimationUtils.autogen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// This file auto-generated with generate-wrappers.js
3-
// Date: Fri Oct 21 2016 15:59:18 GMT-0700 (PDT)
3+
// Date: Fri Oct 21 2016 17:17:07 GMT-0700 (PDT)
44
//
55

66
var _ = require('underscore');

‎js/src/animation/KeyframeTrack.autogen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// This file auto-generated with generate-wrappers.js
3-
// Date: Fri Oct 21 2016 15:59:18 GMT-0700 (PDT)
3+
// Date: Fri Oct 21 2016 17:17:07 GMT-0700 (PDT)
44
//
55

66
var _ = require('underscore');

‎js/src/animation/PropertyBinding.autogen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// This file auto-generated with generate-wrappers.js
3-
// Date: Fri Oct 21 2016 15:59:18 GMT-0700 (PDT)
3+
// Date: Fri Oct 21 2016 17:17:07 GMT-0700 (PDT)
44
//
55

66
var _ = require('underscore');

0 commit comments

Comments
 (0)