From 00f25bcce58789ad0f8082406f233de461d7ccf2 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 9 Jan 2024 20:18:17 +0000
Subject: Add lights resource set and test scene

---
 res/lights.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 res/lights.xml

(limited to 'res')

diff --git a/res/lights.xml b/res/lights.xml
new file mode 100644
index 0000000..137137d
--- /dev/null
+++ b/res/lights.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ilt p.id="assetFactory">
+  <asset p.typeid="Illuminator" id="r-light" name="r-light">
+    <bodyMesh id="body">
+      <use type="cylinder" scale="0.12,0.12,1" colour="lightslategray"/>
+      <use type="cylinder" scale="0.07,0.07,3" position="0,0,1" colour="lightslategray"/>
+      <use type="cylinder" scale="0.05,0.05,1.5" position="0,0.1,4" rotation="1.5,0,0" colour="lightslategray"/>
+    </bodyMesh>
+  </asset>
+  <!-- yes I'm hacking some floor to light up as though its a bush -->
+  <asset p.typeid="Foliage" id="floor" name="floor">
+    <bodyMesh id="body">
+      <use type="plane" scale="10,10,0" colour="#aaaaaa"/>
+    </bodyMesh>
+  </asset>
+</ilt>
-- 
cgit v1.2.3


From 8740d30b01f6c12e2fcea0450df73736cd17dc87 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 10 Jan 2024 01:10:44 +0000
Subject: Add spot light definition, loader, and rendering

Rendering is untested, data is passed to whatever GL program is currently active.
---
 res/lights.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res')

diff --git a/res/lights.xml b/res/lights.xml
index 137137d..5c11fdf 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -6,6 +6,7 @@
       <use type="cylinder" scale="0.07,0.07,3" position="0,0,1" colour="lightslategray"/>
       <use type="cylinder" scale="0.05,0.05,1.5" position="0,0.1,4" rotation="1.5,0,0" colour="lightslategray"/>
     </bodyMesh>
+    <spotLight position="0,1.4,4.1" direction="0,0,-1" colour=".9,.9,.9" kq="8000" arc="1.5"/>
   </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
-- 
cgit v1.2.3


From b8401062e1d3f5e6554ab7fd9b983ea63cfb05c5 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 10 Jan 2024 19:04:30 +0000
Subject: Initial commit with working light instancing

---
 res/lights.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/lights.xml b/res/lights.xml
index 5c11fdf..536afd2 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -4,9 +4,9 @@
     <bodyMesh id="body">
       <use type="cylinder" scale="0.12,0.12,1" colour="lightslategray"/>
       <use type="cylinder" scale="0.07,0.07,3" position="0,0,1" colour="lightslategray"/>
-      <use type="cylinder" scale="0.05,0.05,1.5" position="0,0.1,4" rotation="1.5,0,0" colour="lightslategray"/>
+      <use type="cylinder" scale="0.05,0.05,1.5" position="0,-0.1,4" rotation="-1.5,0,0" colour="lightslategray"/>
     </bodyMesh>
-    <spotLight position="0,1.4,4.1" direction="0,0,-1" colour=".9,.9,.9" kq="8000" arc="1.5"/>
+    <spotLight position="0,1400,4100" direction="0,0,-1" colour=".9,.9,.9" kq="0.01" arc="1.5"/>
   </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
-- 
cgit v1.2.3


From b6fbe0bf35bf58447f2f83f6fc519b4d3eaea107 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 11 Jan 2024 18:57:57 +0000
Subject: Full implementation passing through light defs from vertex data

Note: there is a bug where the light position/direction are rotated backwards to the
model even though its using the model's rotation matrix... no idea why/how.
---
 res/lights.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/lights.xml b/res/lights.xml
index 536afd2..a395306 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -5,8 +5,9 @@
       <use type="cylinder" scale="0.12,0.12,1" colour="lightslategray"/>
       <use type="cylinder" scale="0.07,0.07,3" position="0,0,1" colour="lightslategray"/>
       <use type="cylinder" scale="0.05,0.05,1.5" position="0,-0.1,4" rotation="-1.5,0,0" colour="lightslategray"/>
+      <use type="cuboid" position="0,1.400,4.060" scale=".14,.3,0.07" colour="lightslategray"/>
     </bodyMesh>
-    <spotLight position="0,1400,4100" direction="0,0,-1" colour=".9,.9,.9" kq="0.01" arc="1.5"/>
+    <spotLight position="0,1400,4100" direction="0,0.1,-1" colour=".9,.9,.9" kq="0.1" arc="1.5"/>
   </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
-- 
cgit v1.2.3


From c922efb8514fde12131d147e892cde31dc408929 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 12 Jan 2024 19:21:09 +0000
Subject: Tweak street light definition

---
 res/lights.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/lights.xml b/res/lights.xml
index a395306..6c051c3 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -7,7 +7,7 @@
       <use type="cylinder" scale="0.05,0.05,1.5" position="0,-0.1,4" rotation="-1.5,0,0" colour="lightslategray"/>
       <use type="cuboid" position="0,1.400,4.060" scale=".14,.3,0.07" colour="lightslategray"/>
     </bodyMesh>
-    <spotLight position="0,1400,4100" direction="0,0.1,-1" colour=".9,.9,.9" kq="0.1" arc="1.5"/>
+    <spotLight position="0,1400,4100" direction="0,0.1,-1" colour=".9,.9,.9" kq="0.3" arc="1.8"/>
   </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
-- 
cgit v1.2.3


From 48a5de8943bda62ba5caefe3b64c66a0d9024dff Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 13 Jan 2024 10:05:58 +0000
Subject: Add old street lamp model

---
 res/lights.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'res')

diff --git a/res/lights.xml b/res/lights.xml
index 6c051c3..8b25599 100644
--- a/res/lights.xml
+++ b/res/lights.xml
@@ -9,6 +9,16 @@
     </bodyMesh>
     <spotLight position="0,1400,4100" direction="0,0.1,-1" colour=".9,.9,.9" kq="0.3" arc="1.8"/>
   </asset>
+  <asset p.typeid="Illuminator" id="old-lamp" name="old-lamp">
+    <bodyMesh id="body">
+      <use type="cylinder" scale="0.13,0.13,.5" colour="#222222"/>
+      <use type="cylinder" scale="0.06,0.06,1.5" position="0,0,.5" colour="#222222"/>
+      <use type="cuboid" scale="0.3,0.02,0.02" position="0,0,1.8" colour="#222222"/>
+      <use type="cuboid" scale="0.2,0.2,0.4" position="0,0,2" colour="#dddddd"/>
+      <use type="cuboid" scale="0.1,0.1,0.1" position="0,0,2.4" colour="#222222"/>
+    </bodyMesh>
+    <pointLight position="0,0,2200" colour=".9,.9,.6" kq="0.3"/>
+  </asset>
   <!-- yes I'm hacking some floor to light up as though its a bush -->
   <asset p.typeid="Foliage" id="floor" name="floor">
     <bodyMesh id="body">
-- 
cgit v1.2.3