8000 Fix for D3 and 3JS demos (#1025) · DindyalM/pyscriptErrors@e53bcf1 · GitHub
[go: up one dir, main page]

Skip to content

Commit e53bcf1

Browse files
authored
Fix for D3 and 3JS demos (pyscript#1025)
* fix for d3 example * fix webgl +upgrade 3js
1 parent bec70b6 commit e53bcf1

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

examples/d3.html

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<link rel="stylesheet" href="./assets/css/examples.css" />
1010
<link rel="stylesheet" href="./assets/prism/prism.css" />
1111
<script defer src="./assets/prism/prism.js"></script>
12+
<script src="https://d3js.org/d3.v7.min.js"></script>
1213
<style>
1314
.loading {
1415
display: inline-block;
@@ -56,16 +57,7 @@
5657
</div>
5758
</div>
5859

59-
<script type="importmap">
60-
{
61-
"imports": {
62-
"d3": "https://cdn.skypack.dev/pin/d3@v7.6.1-1Q0NZ0WZnbYeSjDusJT3/mode=imports,min/optimized/d3.js"
63-
}
64-
}
65-
</script>
66-
6760
<script type="module">
68-
import * as d3 from "https://cdn.skypack.dev/pin/d3@v7.6.1-1Q0NZ0WZnbYeSjDusJT3/mode=imports,min/optimized/d3.js";
6961

7062
const fruits = [
7163
{name: "🍊", count: 21},
@@ -120,8 +112,9 @@
120112
</script>
121113

122114
<py-script>
115+
import js
123116
from pyodide.ffi import create_proxy, to_js
124-
import d3
117+
d3 = js.d3
125118

126119
fruits = [
127120
dict(name="🍊", count=21),

examples/webgl/raycaster/index.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="col"></div>
2121
</div>
2222
</div>
23-
<script src='https://cdnjs.cloudflare.com/ajax/libs/three.js/89/three.min.js'></script>
23+
<script src='https://cdnjs.cloudflare.com/ajax/libs/three.js/0.147.0/three.min.js'></script>
2424

2525
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
2626
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
@@ -34,8 +34,6 @@
3434
from js import document
3535
import asyncio
3636

37-
38-
39< 8000 /td>37
mouse = THREE.Vector2.new();
4038

4139
renderer = THREE.WebGLRenderer.new({"antialias":True})
@@ -146,13 +144,12 @@
146144
scene.add(lightBack);
147145

148146
rectSize = 2
149-
intensity = 100
147+
intensity = 14
150148
rectLight = THREE.RectAreaLight.new( 0x0FFFFF, intensity, rectSize, rectSize )
151149
rectLight.position.set( 0, 0, 1 )
152150
rectLight.lookAt( 0, 0, 0 )
153151
scene.add( rectLight )
154152

155-
rectLightHelper = THREE.RectAreaLightHelper.new( rectLight );
156153
raycaster = THREE.Raycaster.new();
157154
uSpeed = 0.1
158155

@@ -190,7 +187,7 @@
190187
renderer.render( scene, camera )
191188
await asyncio.sleep(0.02)
192189

193-
asyncio.ensure_future(main())
190+
asyncio.ensure_future(main())
194191

195192
</py-script>
196193
</body>

0 commit comments

Comments
 (0)
0