From dd0410feea06f736e165950cf9ecc352a0cead3f Mon Sep 17 00:00:00 2001
From: Neon22 <899355+Neon22@users.noreply.github.com>
Date: Thu, 29 Aug 2024 14:39:57 +1200
Subject: [PATCH] update icosahedron

Used 2024.8.2
fixed lighting - changed since  version 147
---
 icosahedron/index.html    |  7 ++-----
 icosahedron/main.py       | 22 +++++++++++-----------
 icosahedron/pyscript.toml |  3 +++
 3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/icosahedron/index.html b/icosahedron/index.html
index cf18953..6bb5922 100644
--- a/icosahedron/index.html
+++ b/icosahedron/index.html
@@ -7,12 +7,12 @@
         <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
         <!-- PyScript CSS -->
-        <link rel="stylesheet" href="https://pyscript.net/releases/2024.1.1/core.css">
+        <link rel="stylesheet" href="https://pyscript.net/releases/2024.8.2/core.css">
         <!-- CSS for examples -->
         <link rel="stylesheet" href="./assets/css/examples.css" />
 
         <!-- This script tag bootstraps PyScript -->
-        <script type="module" src="https://pyscript.net/releases/2024.1.1/core.js"></script>
+        <script type="module" src="https://pyscript.net/releases/2024.8.2/core.js"></script>
 
         <!-- for splashscreen -->
         <style>
@@ -29,9 +29,6 @@
 
         <!-- Icosahedron Example Specific CSS -->
         <link rel="stylesheet" href="./assets/css/icosahedron.css" />
-
-        <!-- Script for Three js -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/0.147.0/three.min.js"></script>
     </head>
 
     <body>
diff --git a/icosahedron/main.py b/icosahedron/main.py
index 6dcb27b..6441459 100644
--- a/icosahedron/main.py
+++ b/icosahedron/main.py
@@ -1,6 +1,7 @@
-from pyodide.ffi import to_js
+from pyscript.ffi import to_js
+from pyscript.js_modules import THREE
 from pyscript import when, window, document
-from js import Math, THREE, performance, Object
+from js import Math, performance
 import asyncio
 
 mouse = THREE.Vector2.new()
@@ -42,11 +43,9 @@ def mathRandom(num = 1):
 particularGroup =  THREE.Object3D.new()
 modularGroup =  THREE.Object3D.new()
 
-perms = {"flatShading":True, "color":"#111111", "transparent":False, "opacity":1, "wireframe":False}
-perms = Object.fromEntries(to_js(perms))
+perms = to_js({"flatShading":True, "color":"#111111", "transparent":False, "opacity":1, "wireframe":False})
 
-particle_perms = {"color":"#FFFFFF", "side":THREE.DoubleSide}
-particle_perms = Object.fromEntries(to_js(particle_perms))
+particle_perms = to_js({"color":"#FFFFFF", "side":THREE.DoubleSide})
 
 def create_cubes(mathRandom, modularGroup):
     i = 0
@@ -108,11 +107,12 @@ def generateParticle(mathRandom, particularGroup, num, amp = 2):
 lightBack.position.set(0, -3, -1)
 
 scene.add(sceneGroup)
-scene.add(light)
-scene.add(lightBack)
+#scene.add(light)
+#scene.add(lightBack)
+#scene.add(ambientLight)
 
-rectSize = 2
-intensity = 14
+rectSize = 3
+intensity = 44
 rectLight = THREE.RectAreaLight.new( 0x0FFFFF, intensity,  rectSize, rectSize )
 rectLight.position.set( 0, 0, 1 )
 rectLight.lookAt( 0, 0, 0 )
@@ -155,4 +155,4 @@ async def main():
         renderer.render( scene, camera )
         await asyncio.sleep(0.02)
 
-asyncio.ensure_future(main())
+main()
\ No newline at end of file
diff --git a/icosahedron/pyscript.toml b/icosahedron/pyscript.toml
index 6ddf69b..67dc53d 100644
--- a/icosahedron/pyscript.toml
+++ b/icosahedron/pyscript.toml
@@ -1,2 +1,5 @@
 name = "WebGL Icosahedron"
 description = "An example how to use Three.js and WebGL to render an Icosahedron in PyScript."
+
+[js_modules.main]
+"https://esm.run/three" = "THREE"
\ No newline at end of file
