From e53bcf15a967218138f801bfce027f87259eae72 Mon Sep 17 00:00:00 2001
From: Ted Patrick <tpatrick@anaconda.com>
Date: Tue, 6 Dec 2022 13:36:03 -0600
Subject: [PATCH] Fix for D3 and 3JS demos (#1025)

* fix for d3 example

* fix webgl +upgrade 3js
---
 examples/d3.html                    | 13 +++----------
 examples/webgl/raycaster/index.html |  9 +++------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/examples/d3.html b/examples/d3.html
index 9e81c857..98f86fba 100644
--- a/examples/d3.html
+++ b/examples/d3.html
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="./assets/css/examples.css" />
     <link rel="stylesheet" href="./assets/prism/prism.css" />
     <script defer src="./assets/prism/prism.js"></script>
+    <script src="https://d3js.org/d3.v7.min.js"></script>
     <style>
     .loading {
       display: inline-block;
@@ -56,16 +57,7 @@
         </div>
       </div>
 
-<script type="importmap">
-{
-  "imports": {
-    "d3": "https://cdn.skypack.dev/pin/d3@v7.6.1-1Q0NZ0WZnbYeSjDusJT3/mode=imports,min/optimized/d3.js"
-  }
-}
-</script>
-
 <script type="module">
-import * as d3 from "https://cdn.skypack.dev/pin/d3@v7.6.1-1Q0NZ0WZnbYeSjDusJT3/mode=imports,min/optimized/d3.js";
 
 const fruits = [
   {name: "🍊", count: 21},
@@ -120,8 +112,9 @@ for (const d of data) {
 </script>
 
 <py-script>
+import js
 from pyodide.ffi import create_proxy, to_js
-import d3
+d3 = js.d3
 
 fruits = [
   dict(name="🍊", count=21),
diff --git a/examples/webgl/raycaster/index.html b/examples/webgl/raycaster/index.html
index 4a297781..cd5c86b5 100644
--- a/examples/webgl/raycaster/index.html
+++ b/examples/webgl/raycaster/index.html
@@ -20,7 +20,7 @@
       <div class="col"></div>
     </div>
   </div>
-<script src='https://cdnjs.cloudflare.com/ajax/libs/three.js/89/three.min.js'></script>
+<script src='https://cdnjs.cloudflare.com/ajax/libs/three.js/0.147.0/three.min.js'></script>
 
 <script defer src="https://pyscript.net/latest/pyscript.js"></script>
 <link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
@@ -34,8 +34,6 @@ from js import Object
 from js import document
 import asyncio
 
-
-
 mouse = THREE.Vector2.new();
 
 renderer = THREE.WebGLRenderer.new({"antialias":True})
@@ -146,13 +144,12 @@ scene.add(light);
 scene.add(lightBack);
 
 rectSize = 2
-intensity = 100
+intensity = 14
 rectLight = THREE.RectAreaLight.new( 0x0FFFFF, intensity,  rectSize, rectSize )
 rectLight.position.set( 0, 0, 1 )
 rectLight.lookAt( 0, 0, 0 )
 scene.add( rectLight )
 
-rectLightHelper = THREE.RectAreaLightHelper.new( rectLight );
 raycaster = THREE.Raycaster.new();
 uSpeed = 0.1
 
@@ -190,7 +187,7 @@ async def main():
     renderer.render( scene, camera )
     await asyncio.sleep(0.02)
 
-    asyncio.ensure_future(main())
+asyncio.ensure_future(main())
 
 </py-script>
 </body>