(mkosarek) Updated roadmap

6 files changed, 40 insertions, 7 deletions

diff --git a/2d/_collisions/polygon_polygon.html b/2d/_collisions/polygon_polygon.html
index 2e22f49..f401385 100644
--- a/2d/_collisions/polygon_polygon.html
+++ b/2d/_collisions/polygon_polygon.html
@@ -255,6 +255,10 @@
 
       <br /> <br />
       I'm sure someone more inclined to proving mathematical truities would love to describe this to you, but, for all intents and purposes, this intutitive understanding is good enough for us. We just want to make games, anyhow. 
+      <br />
+      
+      <h3>Finding which point causes the intersection</h3>
+      
     </p>
   </section>
   <section>
diff --git a/2d/_collisions/polygon_polygon/dist/output.wasm b/2d/_collisions/polygon_polygon/dist/output.wasm
index d865038..f4ef9bb 100755
--- a/2d/_collisions/polygon_polygon/dist/output.wasm
+++ b/2d/_collisions/polygon_polygon/dist/output.wasm
diff --git a/2d/_collisions/polygon_polygon/main.cpp b/2d/_collisions/polygon_polygon/main.cpp
index ff01e52..e85cc25 100644
--- a/2d/_collisions/polygon_polygon/main.cpp
+++ b/2d/_collisions/polygon_polygon/main.cpp
@@ -403,8 +403,6 @@ void update(float32 deltaTimeSeconds, void* userData) {
                 continue;
             }
 
-            printf("Might intersect\n");
-
             first->calculateTransformedVertices();
             second->calculateTransformedVertices();
 			
@@ -416,13 +414,14 @@ void update(float32 deltaTimeSeconds, void* userData) {
 			// Handle collison here
 			IntersectionResult irCopy = ir;
 			float32 copyDt = deltaTimeSeconds;
+            float32 subdivisionDt = copyDt / 8.f;
 		
 			do {
 				first->restorePreviousBody();
 				second->restorePreviousBody();
 				
 				ir = irCopy;
-				copyDt = copyDt /= 2.f;
+				copyDt = copyDt - subdivisionDt;
 
 			    first->update(copyDt);
 				second->update(copyDt);
diff --git a/roadmap.html b/roadmap.html
index 274fe09..f4c7113 100644
--- a/roadmap.html
+++ b/roadmap.html
@@ -107,16 +107,31 @@
   <section>
     <h1>July 2021: 3D headway (Planning)</h1>
     <ul>
-      <li>Explanation of Quaternions</li>
+      <li class="halfway">Finish SAT Collision Info (very close)</li>
+      <li class="halfway">2D rigidbody explanation 3</li>
       <li>3D Rigid Body Collisions</li>
       <li>ZIP file creator for downloads</li>
+      <li>Explanation of Quaternions</li>
     </ul>
+    <p>
+      The last two months went almost as planned. I think I misjudged how long and how much brainpower it would
+      take me to write explanations for all of these things. A classic engineer mistake. We see writing,
+      and we think, "Easy, I can do that." And I usually can, but I am a bit rusty as of late. Additionally, this
+      writing involved a lot of diagrams and math equations that I struggled to put into HTML. I even had to learn
+      to make some simple drawings in gimp, which was a bit of a hurdle.
+      <br /><br />
+      That being said, I am fairly configdent that I can finish the above items in the month of July (maybe minus the
+      quaternion work, but we will see). To get my confidence up, I am going to begin with the ZIP file creator for
+      downloading individual projects. That will definitely be worthwhile.
+    </p>
   </section>
   <section>
     <h1>May/June 2021: More Collisions</h1>
     <ul>
       <li class="halfway">SAT Collisions for Convex Polygons with Explanation</li>
-      <li class="halfway">2D rigidbody physics demos + explanations</li>
+      <li class="done">2D rigidbody physics demo + explanation 1</li>
+      <li class="done">2D rigidbody physics demo + explanation 2</li>
+      <li class="halfway">2D rigidbody physics demo + explanation 3</li>
       <li class="done">Remove (or hide) ellipse collision pages for now</li>
       <li class="done">3D scene setup</li>
       <li class="abandoned">3D scene basic physics with spheres bouncing around a scene</li>
diff --git a/roadmap.html.content b/roadmap.html.content
index 5e662cc..460828f 100644
--- a/roadmap.html.content
+++ b/roadmap.html.content
@@ -55,16 +55,31 @@
   <section>
     <h1>July 2021: 3D headway (Planning)</h1>
     <ul>
-      <li>Explanation of Quaternions</li>
+      <li class="halfway">Finish SAT Collision Info (very close)</li>
+      <li class="halfway">2D rigidbody explanation 3</li>
       <li>3D Rigid Body Collisions</li>
       <li>ZIP file creator for downloads</li>
+      <li>Explanation of Quaternions</li>
     </ul>
+    <p>
+      The last two months went almost as planned. I think I misjudged how long and how much brainpower it would
+      take me to write explanations for all of these things. A classic engineer mistake. We see writing,
+      and we think, "Easy, I can do that." And I usually can, but I am a bit rusty as of late. Additionally, this
+      writing involved a lot of diagrams and math equations that I struggled to put into HTML. I even had to learn
+      to make some simple drawings in gimp, which was a bit of a hurdle.
+      <br /><br />
+      That being said, I am fairly configdent that I can finish the above items in the month of July (maybe minus the
+      quaternion work, but we will see). To get my confidence up, I am going to begin with the ZIP file creator for
+      downloading individual projects. That will definitely be worthwhile.
+    </p>
   </section>
   <section>
     <h1>May/June 2021: More Collisions</h1>
     <ul>
       <li class="halfway">SAT Collisions for Convex Polygons with Explanation</li>
-      <li class="halfway">2D rigidbody physics demos + explanations</li>
+      <li class="done">2D rigidbody physics demo + explanation 1</li>
+      <li class="done">2D rigidbody physics demo + explanation 2</li>
+      <li class="halfway">2D rigidbody physics demo + explanation 3</li>
       <li class="done">Remove (or hide) ellipse collision pages for now</li>
       <li class="done">3D scene setup</li>
       <li class="abandoned">3D scene basic physics with spheres bouncing around a scene</li>
diff --git a/transpiler/transpiler b/transpiler/transpiler
index c7ef4fc..60e0eec 100755
--- a/transpiler/transpiler
+++ b/transpiler/transpiler