add v1v2v3v4 slides and resize images

A-deLuna · Oct 26, 2019 · ba2ac22 · ba2ac22
1 parent e858872
commit ba2ac22
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 23 deletions.
diff --git a/docs/como-encontrar-baricentricas.html b/docs/como-encontrar-baricentricas.html
@@ -11,7 +11,7 @@
     <h2> Punto P como suma de vectores </h2>
     <h4> u CA + v CB = P
     <div class="hcenter">
-      <div id="jxgbox" class="jxgbox" style="width:50vw; height:50vh;"> </div>
+      <div id="jxgbox" class="jxgbox" style="width:50vw; height:65vh;"> </div>
     </div>
     <div class="bottom-right">
       <a id="left" href="coordeneadas-baricntricas.html">

diff --git a/docs/como-encuentro-punto-en-triangulo.html b/docs/como-encuentro-punto-en-triangulo.html
@@ -10,7 +10,7 @@
   <body>
       <h2> ¿Como encontramos si un punto está en un triángulo?</h2>
     <div class="hcenter">
-      <div id="jxgbox" class="jxgbox" style="width:50vw; height:50vh;"> </div>
+      <div id="jxgbox" class="jxgbox" style="width:50vw; height:70vh;"> </div>
     </div>
       <div class="bottom-right">
         <a id="left" href="codigo-dibujar-traingulo.html">

diff --git a/docs/coordeneadas-baricntricas.html b/docs/coordeneadas-baricntricas.html
@@ -10,7 +10,7 @@
   <body>
     <h2> Coordenadas Baricentricas </h2>
     <div class="hcenter">
-      <div id="jxgbox" class="jxgbox" style="width:50vw; height:50vh;"> </div>
+      <div id="jxgbox" class="jxgbox" style="width:50vw; height:70vh;"> </div>
     </div>
     <div class="bottom-right">
       <a id="left" href="como-encuentro-punto-en-triangulo.html">

diff --git a/docs/cross-product-anim.gif b/docs/cross-product-anim.gif
diff --git a/docs/cross-product-simple.gif b/docs/cross-product-simple.gif
diff --git a/docs/depth-buffer-baricentricas.html b/docs/depth-buffer-baricentricas.html
@@ -8,9 +8,9 @@
     <link rel="stylesheet" href="jsxgraph.css">
   </head>
   <body>
-    <h2> depth-buffer-baricentricas </h2>
+    <h2> Interpolar entre profundidades </h2>
     <div class="hcenter">
-      <div id="jxgbox" class="jxgbox" style="width:50vw; height:50vh;"> </div>
+      <div id="jxgbox" class="jxgbox" style="width:50vw; height:70vh;"> </div>
     </div>
     <div class="bottom-right">
       <a id="left" href="depth-buffer-per-pixel4.html">

diff --git a/docs/depth-buffer.html b/docs/depth-buffer.html
@@ -7,10 +7,10 @@
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
-    <h2> depth-buffer </h2>
+    <h2> Depth Buffer </h2>
     <div class="hcenter">
-      <img src="OverlappingScene.png"></img>
-      <img src="OverlappingResult.png"></img>
+      <img src="OverlappingScene.png" class="single-image"></img>
+      <img src="OverlappingResult.png" class="single-image"></img>
     </div>
       <div class="bottom-right">
         <a id="left" href="renderer-v2.html">

diff --git a/docs/flat-shading.html b/docs/flat-shading.html
@@ -8,9 +8,9 @@
     <link rel="stylesheet" href="jsxgraph.css">
   </head>
   <body>
-    <h2> flat-shading </h2>
+    <h2> Flat Shading </h2>
     <div class="hcenter">
-      <div id="jxgbox" class="jxgbox" style="width:50vw; height:50vh;"> </div>
+      <div id="jxgbox" class="jxgbox" style="width:50vw; height:70vh;"> </div>
   </div>
     <div class="bottom-right">
       <a id="left" href="renderer-v1.html">

diff --git a/docs/index.html b/docs/index.html
@@ -9,6 +9,8 @@
   <body>
       <h1> Intro a 3D Rendering </h2>
       <h3> Por: Tony de Luna </h3>
+      <h4> Slides: <a class="diff" href="https://a-deluna.github.io/3dRenderingTalk/" target="_blank"> https://a-deluna.github.io/3dRenderingTalk/</a></h4>
+      <h4> Repo: <a class="diff" href="https://github.com/A-deLuna/3dRenderingTalk/" target="_blank">https://github.com/A-deLuna/3dRenderingTalk/ </a></h4>
       <div class="bottom-right">
         <a id="right" href="meta.html">
           <button>

diff --git a/docs/producto-cruz.html b/docs/producto-cruz.html
@@ -7,7 +7,13 @@
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
-      <h2> producto-cruz </h2>
+      <h2> Producto Cruz </h2>
+      <div class="hcenter">
+        <img style="background-color:white;" src="cross-product-simple.gif"/>
+      </div>
+      <div class="hcenter">
+        <img style="background-color:white;" src="cross-product-anim.gif"/>
+      </div>
       <div class="bottom-right">
         <a id="left" href="producto-punto.html">
           <button>

diff --git a/docs/producto-punto.html b/docs/producto-punto.html
@@ -34,8 +34,8 @@ <h4> (a,b,c) * (x,y,z) = a*x + b*y +c*z </h4>
         { axis:true,
           boundingbox: [-2,2,2,-2],
           keepaspectration: true});
-      var p1 = board.create('point',[0,1], {name:'A'});
-      var p2 = board.create('point',[1,0], {name:'B'});
+      var p1 = board.create('point',[0,1], {name:'A', showInfobox:false});
+      var p2 = board.create('point',[1,0], {name:'B', showInfobox:false});
       var v1 = board.create('arrow', [[0,0],'A'], {strokewidth: 5 });
       var v2 = board.create('arrow', [[0,0],'B'], 
         {strokewidth: 5, strokeColor: "#f00"});

diff --git a/docs/renderer-v1.html b/docs/renderer-v1.html
@@ -7,7 +7,11 @@
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
-      <h2> renderer-v1 </h2>
+      <h2> V1 </h2>
+      <div class="hcenter">
+        <img src="renderv1.png" class="single-image">
+      </div>
+      <a class="diff" target="_blank" href="https://github.com/A-deLuna/3dRenderingTalk/commit/41ef550d3988bdc1da31010d26d3eb58df6c54f3"> <h4>Diff</h4> </a>
       <div class="bottom-right">
         <a id="left" href="como-encontrar-baricentricas-codigo.html">
           <button>

diff --git a/docs/renderer-v2.html b/docs/renderer-v2.html
@@ -7,7 +7,11 @@
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
-      <h2> renderer-v2 </h2>
+      <h2> V2 </h2>
+      <div class="hcenter">
+        <img src="renderv2.png" class="single-image">
+      </div>
+      <a class="diff" target="_blank" href="https://github.com/A-deLuna/3dRenderingTalk/commit/e94f9af4d6a5d42159eb0f6a0e77fa7e06e61f1b"> <h4>Diff</h4> </a>
       <div class="bottom-right">
         <a id="left" href="flat-shading-simulation.html">
           <button>

diff --git a/docs/renderer-v3.html b/docs/renderer-v3.html
@@ -7,7 +7,11 @@
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
-      <h2> renderer-v3 </h2>
+      <h2> V3 </h2>
+      <div class="hcenter">
+        <img src="renderv3.png" class="single-image">
+      </div>
+      <a class="diff" target="_blank" href="https://github.com/A-deLuna/3dRenderingTalk/commit/f53917922adb404c44d453fedcc44dab0d4a8796"> <h4>Diff</h4> </a>
       <div class="bottom-right">
         <a id="left" href="depth-buffer-baricentricas.html">
           <button>

diff --git a/docs/renderer-v4.html b/docs/renderer-v4.html
@@ -7,7 +7,11 @@
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
-      <h2> renderer-v4 </h2>
+      <h2> V4 </h2>
+      <div class="hcenter">
+        <img class="single-image" src="renderv4.png">
+      </div>
+      <a class="diff" target="_blank" href="https://github.com/A-deLuna/3dRenderingTalk/commit/e8588720185d89f9e4bf5ac1f30f18bc6820cf0c"> <h4>Diff</h4> </a>
       <div class="bottom-right">
         <a id="left" href="uv-baricenter.html">
           <button>

diff --git a/docs/renderv1.png b/docs/renderv1.png
diff --git a/docs/renderv2.png b/docs/renderv2.png
diff --git a/docs/renderv3.png b/docs/renderv3.png
diff --git a/docs/renderv4.png b/docs/renderv4.png
diff --git a/docs/style.css b/docs/style.css
@@ -1,9 +1,13 @@
-ul, li, h1, h2, h3, h4, p , td{
+ul, li, h1, h2, h3, h4, p , td, a.diff {
   font-family: "Source Sans Pro", Helvetica, sans-serif;
   color: #fff;
   text-align: center;
 }
 
+img.single-image {
+  height: 70vh;
+}
+
 ul, li {
   font-size: 1.5em;
 }

diff --git a/docs/texture-mapping.html b/docs/texture-mapping.html
@@ -7,9 +7,9 @@
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
-      <h2> texture-mapping </h2>
+      <h2> Texture Mapping </h2>
       <div class="hcenter">
-        <img src="african_head_diffuse.png" >
+        <img class="single-image" src="african_head_diffuse.png" >
       </div>
       <div class="bottom-right">
         <a id="left" href="renderer-v3.html">

diff --git a/docs/uv-baricenter.html b/docs/uv-baricenter.html
@@ -10,7 +10,7 @@
   <body>
   <h2> uv-baricenter </h2>
   <div class="hcenter">
-    <div id="jxgbox" class="jxgbox" style="width:50vw; height:50vh;"> </div>
+    <div id="jxgbox" class="jxgbox" style="width:50vw; height:70vh;"> </div>
   </div>
     <div class="bottom-right">
       <a id="left" href="uv-coords-in-model.html">
@@ -34,7 +34,7 @@ <h2> uv-baricenter </h2>
       var n2 = '(.75,.55)';
       var n3 = '(1,0)';
       var p1 = board.create('point',[1.5,-1],{color:'blue',name:n1});
-      var p2 = board.create('point',[2.5,3], {color:'blue',name:n2});
+      var p2 = board.create('point',[2.5,2], {color:'blue',name:n2});
       var p3 = board.create('point',[3.5,-1], {color:'blue',name:n3});
       var p4 = board.create('point',[2.5,1], {name:'P', size:5, showInfobox:false});
       var poly = board.create('polygon', [p1,p2,p3]);

diff --git a/docs/uv-coords-in-model.html b/docs/uv-coords-in-model.html
@@ -9,7 +9,7 @@
   <body>
       <h2> uv-coords-in-model </h2>
       <div class="hcenter">
-        <img src="texturemapping.png" >
+        <img class="single-image" src="texturemapping.png" >
       </div>
       <div class="bottom-right">
         <a id="left" href="texture-mapping.html">