TA159

Notas, resueltos y trabajos practicos de la materia Sistemas Gráficos
Index Commits Files Refs Submodules README LICENSE
commit 1537320fb86c3041199bb76110aabe5e05b7fd50
parent 82bd52054cc8543db98cb5d257f45150608c9e08
Author: Martin Kloeckner <mjkloeckner@gmail.com>
Date:   Mon,  8 Jul 2024 18:17:44 -0300

remove unused assets

Diffstat:
Dtp/src/assets/elevation_map.png | 0
Dtp/src/assets/elevation_map2.png | 0
Dtp/src/assets/elevation_map3.png | 0
Dtp/src/assets/tree_forbidden_zone_map.png | 0
Mtp/src/standalone/terrain.js | 2+-
Mtp/src/standalone/track-map.js | 6++----
Mtp/src/terrain.js | 2+-
Mtp/src/trees.js | 4++--
8 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tp/src/assets/elevation_map.png b/tp/src/assets/elevation_map.png
Binary files differ.
diff --git a/tp/src/assets/elevation_map2.png b/tp/src/assets/elevation_map2.png
Binary files differ.
diff --git a/tp/src/assets/elevation_map3.png b/tp/src/assets/elevation_map3.png
Binary files differ.
diff --git a/tp/src/assets/tree_forbidden_zone_map.png b/tp/src/assets/tree_forbidden_zone_map.png
Binary files differ.
diff --git a/tp/src/standalone/terrain.js b/tp/src/standalone/terrain.js
@@ -13,7 +13,7 @@ const amplitudeBottom = -1.00;
 import tierraUrl       from '../assets/tierra.jpg'
 import rocaUrl         from '../assets/roca.jpg'
 import pastoUrl        from '../assets/pasto.jpg'
-import elevationMapUrl from '../assets/elevation_map2.png'
+import elevationMapUrl from '../assets/elevation_map_wider_river.png'
 
 const textures = {
     tierra:       { url: tierraUrl,       object: null },
diff --git a/tp/src/standalone/track-map.js b/tp/src/standalone/track-map.js
@@ -14,8 +14,8 @@ const amplitudeBottom = -1.00;
 import tierraUrl           from '../assets/tierra.jpg'
 import rocaUrl             from '../assets/roca.jpg'
 import pastoUrl            from '../assets/pasto.jpg'
-import elevationMapUrl     from '../assets/elevation_map2.png'
-import treeForbiddenMapUrl from '../assets/tree_forbidden_zone_map.png'
+import elevationMapUrl     from '../assets/elevation_map_wider_river.png'
+import treeForbiddenMapUrl from '../assets/tree_forbidden_zone_map_wider_path.png'
 
 const textures = {
     tierra:           { url: tierraUrl,           object: null },
@@ -92,12 +92,10 @@ function isForbbidenPosition(position) {
     const y = position.y;
     const z = Math.floor(position.z);
 
-    /*
     if((y > 5.0) || (y < 2.65)){
         console.log("(" + position.x + ", " + position.y + ", " + position.z + ") is not valid ");
         return true;
     }
-    */
     
     let pixelArray = getPixelXY(treesForbiddenMap, x, z);
     const R = pixelArray[0]; // Red
diff --git a/tp/src/terrain.js b/tp/src/terrain.js
@@ -9,7 +9,7 @@ const amplitudeBottom = -1.00;
 import rocaUrl             from './assets/roca.jpg'
 import pastoUrl            from './assets/pasto.jpg'
 import tierraUrl           from './assets/tierra.jpg'
-import elevationMapUrl     from './assets/elevation_map2.png'
+import elevationMapUrl     from './assets/elevation_map_wider_river.png'
 
 const textures = {
     tierra:       { url: tierraUrl,       object: null },
diff --git a/tp/src/trees.js b/tp/src/trees.js
@@ -2,8 +2,8 @@ import * as THREE from 'three';
 
 let treesForbiddenMapData, treesForbiddenMap, elevationMap, elevationMapData;
 
-import elevationMapUrl     from './assets/elevation_map2.png'
-import treeForbiddenMapUrl from './assets/tree_forbidden_zone_map.png'
+import elevationMapUrl     from './assets/elevation_map_wider_river.png'
+import treeForbiddenMapUrl from './assets/tree_forbidden_zone_map_wider_path.png'
 
 const textures = {
     elevationMap:     { url: elevationMapUrl, object: null },