Skip to content

Commit 1a013b5

Browse files
vidartfvidartf
committed
Bugfixes and example updates
1 parent 23a3491 commit 1a013b5

File tree

9 files changed

+116
-300
lines changed

9 files changed

+116
-300
lines changed

‎examples/BufferAttributes and BufferGeometry.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@
165165
"source": [
166166
"# Simple square with unique vertices\n",
167167
"vertices = BufferAttribute(\n",
168-
" array=np.array([\n",
169-
" [-1.0, -1.0, 1.0],\n",
170-
" [ 1.0, -1.0, 1.0],\n",
171-
" [ 1.0, 1.0, 1.0],\n",
172-
" [-1.0, 1.0, 1.0],\n",
168+
" array=scale_factor * np.array([\n",
169+
" [-1.0, -1.0, 0.0],\n",
170+
" [ 1.0, -1.0, 0.0],\n",
171+
" [ 1.0, 1.0, 0.0],\n",
172+
" [-1.0, 1.0, 0.0],\n",
173173
" ], dtype=np.float32),\n",
174174
" normalized=False)"
175175
]
@@ -316,7 +316,7 @@
316316
"name": "python",
317317
"nbconvert_exporter": "python",
318318
"pygments_lexer": "ipython3",
319-
"version": "3.5.3"
319+
"version": "3.5.4"
320320
}
321321
},
322322
"nbformat": 4,

‎examples/Geometries.ipynb

Lines changed: 37 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
{
44
"cell_type": "code",
55
"execution_count": null,
6-
"metadata": {
7-
"collapsed": true
8-
},
6+
"metadata": {},
97
"outputs": [],
108
"source": [
119
"from pythreejs import *\n",
@@ -16,9 +14,7 @@
1614
{
1715
"cell_type": "code",
1816
"execution_count": null,
19-
"metadata": {
20-
"collapsed": true
21-
},
17+
"metadata": {},
2218
"outputs": [],
2319
"source": [
2420
"BoxGeometry(\n",
@@ -33,9 +29,7 @@
3329
{
3430
"cell_type": "code",
3531
"execution_count": null,
36-
"metadata": {
37-
"collapsed": true
38-
},
32+
"metadata": {},
3933
"outputs": [],
4034
"source": [
4135
"BoxBufferGeometry(\n",
@@ -50,9 +44,7 @@
5044
{
5145
"cell_type": "code",
5246
"execution_count": null,
53-
"metadata": {
54-
"collapsed": true
55-
},
47+
"metadata": {},
5648
"outputs": [],
5749
"source": [
5850
"CircleGeometry(\n",
@@ -65,9 +57,7 @@
6557
{
6658
"cell_type": "code",
6759
"execution_count": null,
68-
"metadata": {
69-
"collapsed": true
70-
},
60+
"metadata": {},
7161
"outputs": [],
7262
"source": [
7363
"CircleBufferGeometry(\n",
@@ -80,9 +70,7 @@
8070
{
8171
"cell_type": "code",
8272
"execution_count": null,
83-
"metadata": {
84-
"collapsed": true
85-
},
73+
"metadata": {},
8674
"outputs": [],
8775
"source": [
8876
"CylinderGeometry(\n",
@@ -99,9 +87,7 @@
9987
{
10088
"cell_type": "code",
10189
"execution_count": null,
102-
"metadata": {
103-
"collapsed": true
104-
},
90+
"metadata": {},
10591
"outputs": [],
10692
"source": [
10793
"CylinderBufferGeometry(\n",
@@ -118,9 +104,7 @@
118104
{
119105
"cell_type": "code",
120106
"execution_count": null,
121-
"metadata": {
122-
"collapsed": false
123-
},
107+
"metadata": {},
124108
"outputs": [],
125109
"source": [
126110
"DodecahedronGeometry(radius=10, detail=0, _flat=True)"
@@ -129,9 +113,7 @@
129113
{
130114
"cell_type": "code",
131115
"execution_count": null,
132-
"metadata": {
133-
"collapsed": true
134-
},
116+
"metadata": {},
135117
"outputs": [],
136118
"source": [
137119
"# TODO:\n",
@@ -141,9 +123,7 @@
141123
{
142124
"cell_type": "code",
143125
"execution_count": null,
144-
"metadata": {
145-
"collapsed": true
146-
},
126+
"metadata": {},
147127
"outputs": [],
148128
"source": [
149129
"# TODO:\n",
@@ -153,9 +133,7 @@
153133
{
154134
"cell_type": "code",
155135
"execution_count": null,
156-
"metadata": {
157-
"collapsed": true
158-
},
136+
"metadata": {},
159137
"outputs": [],
160138
"source": [
161139
"IcosahedronGeometry(radius=10, _flat=True)"
@@ -164,9 +142,7 @@
164142
{
165143
"cell_type": "code",
166144
"execution_count": null,
167-
"metadata": {
168-
"collapsed": false
169-
},
145+
"metadata": {},
170146
"outputs": [],
171147
"source": [
172148
"LatheBufferGeometry(\n",
@@ -184,9 +160,7 @@
184160
{
185161
"cell_type": "code",
186162
"execution_count": null,
187-
"metadata": {
188-
"collapsed": true
189-
},
163+
"metadata": {},
190164
"outputs": [],
191165
"source": [
192166
"OctahedronGeometry(radius=10, detail=0, _flat=True)"
@@ -195,9 +169,7 @@
195169
{
196170
"cell_type": "code",
197171
"execution_count": null,
198-
"metadata": {
199-
"collapsed": true
200-
},
172+
"metadata": {},
201173
"outputs": [],
202174
"source": [
203175
"ParametricGeometry(\n",
@@ -213,9 +185,7 @@
213185
{
214186
"cell_type": "code",
215187
"execution_count": null,
216-
"metadata": {
217-
"collapsed": true
218-
},
188+
"metadata": {},
219189
"outputs": [],
220190
"source": [
221191
"PlaneGeometry(\n",
@@ -228,9 +198,7 @@
228198
{
229199
"cell_type": "code",
230200
"execution_count": null,
231-
"metadata": {
232-
"collapsed": true
233-
},
201+
"metadata": {},
234202
"outputs": [],
235203
"source": [
236204
"PlaneBufferGeometry(\n",
@@ -243,9 +211,7 @@
243211
{
244212
"cell_type": "code",
245213
"execution_count": null,
246-
"metadata": {
247-
"collapsed": true
248-
},
214+
"metadata": {},
249215
"outputs": [],
250216
"source": [
251217
"# TODO\n",
@@ -255,9 +221,7 @@
255221
{
256222
"cell_type": "code",
257223
"execution_count": null,
258-
"metadata": {
259-
"collapsed": true
260-
},
224+
"metadata": {},
261225
"outputs": [],
262226
"source": [
263227
"# TODO: issues when radius is 0...\n",
@@ -273,9 +237,7 @@
273237
{
274238
"cell_type": "code",
275239
"execution_count": null,
276-
"metadata": {
277-
"collapsed": true
278-
},
240+
"metadata": {},
279241
"outputs": [],
280242
"source": [
281243
"# TODO: issues when radius is 0...\n",
@@ -291,9 +253,7 @@
291253
{
292254
"cell_type": "code",
293255
"execution_count": null,
294-
"metadata": {
295-
"collapsed": true
296-
},
256+
"metadata": {},
297257
"outputs": [],
298258
"source": [
299259
"# TODO\n",
@@ -303,9 +263,7 @@
303263
{
304264
"cell_type": "code",
305265
"execution_count": null,
306-
"metadata": {
307-
"collapsed": true
308-
},
266+
"metadata": {},
309267
"outputs": [],
310268
"source": [
311269
"SphereGeometry(\n",
@@ -321,9 +279,7 @@
321279
{
322280
"cell_type": "code",
323281
"execution_count": null,
324-
"metadata": {
325-
"collapsed": true
326-
},
282+
"metadata": {},
327283
"outputs": [],
328284
"source": [
329285
"SphereBufferGeometry(\n",
@@ -339,9 +295,7 @@
339295
{
340296
"cell_type": "code",
341297
"execution_count": null,
342-
"metadata": {
343-
"collapsed": true
344-
},
298+
"metadata": {},
345299
"outputs": [],
346300
"source": [
347301
"TetrahedronGeometry(radius=10, detail=1, _flat=True)"
@@ -350,9 +304,7 @@
350304
{
351305
"cell_type": "code",
352306
"execution_count": null,
353-
"metadata": {
354-
"collapsed": true
355-
},
307+
"metadata": {},
356308
"outputs": [],
357309
"source": [
358310
"# TODO: font loading\n",
@@ -362,9 +314,7 @@
362314
{
363315
"cell_type": "code",
364316
"execution_count": null,
365-
"metadata": {
366-
"collapsed": true
367-
},
317+
"metadata": {},
368318
"outputs": [],
369319
"source": [
370320
"TorusGeometry(\n",
@@ -378,9 +328,7 @@
378328
{
379329
"cell_type": "code",
380330
"execution_count": null,
381-
"metadata": {
382-
"collapsed": true
383-
},
331+
"metadata": {},
384332
"outputs": [],
385333
"source": [
386334
"TorusBufferGeometry(radius=100)"
@@ -389,9 +337,7 @@
389337
{
390338
"cell_type": "code",
391339
"execution_count": null,
392-
"metadata": {
393-
"collapsed": true
394-
},
340+
"metadata": {},
395341
"outputs": [],
396342
"source": [
397343
"TorusKnotGeometry(\n",
@@ -406,9 +352,7 @@
406352
{
407353
"cell_type": "code",
408354
"execution_count": null,
409-
"metadata": {
410-
"collapsed": true
411-
},
355+
"metadata": {},
412356
"outputs": [],
413357
"source": [
414358
"TorusKnotBufferGeometry(\n",
@@ -423,9 +367,7 @@
423367
{
424368
"cell_type": "code",
425369
"execution_count": null,
426-
"metadata": {
427-
"collapsed": false
428-
},
370+
"metadata": {},
429371
"outputs": [],
430372
"source": [
431373
"# TODO: handling THREE.Curve\n",
@@ -440,9 +382,7 @@
440382
{
441383
"cell_type": "code",
442384
"execution_count": null,
443-
"metadata": {
444-
"collapsed": true
445-
},
385+
"metadata": {},
446386
"outputs": [],
447387
"source": [
448388
"WireframeGeometry(geometry=TorusBufferGeometry(\n",
@@ -457,33 +397,31 @@
457397
{
458398
"cell_type": "code",
459399
"execution_count": null,
460-
"metadata": {
461-
"collapsed": true
462-
},
400+
"metadata": {},
463401
"outputs": [],
464402
"source": []
465403
}
466404
],
467405
"metadata": {
468406
"anaconda-cloud": {},
469407
"kernelspec": {
470-
"display_name": "Python [py27]",
408+
"display_name": "Python 3",
471409
"language": "python",
472-
"name": "Python [py27]"
410+
"name": "python3"
473411
},
474412
"language_info": {
475413
"codemirror_mode": {
476414
"name": "ipython",
477-
"version": 2
415+
"version": 3
478416
},
479417
"file_extension": ".py",
480418
"mimetype": "text/x-python",
481419
"name": "python",
482420
"nbconvert_exporter": "python",
483-
"pygments_lexer": "ipython2",
484-
"version": "2.7.12"
421+
"pygments_lexer": "ipython3",
422+
"version": "3.5.4"
485423
}
486424
},
487425
"nbformat": 4,
488-
"nbformat_minor": 0
426+
"nbformat_minor": 1
489427
}

0 commit comments

Comments
 (0)