Entrega 3

salometredici · May 29, 2019 · 64c6f16 · 64c6f16
1 parent df43d7c
commit 64c6f16
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/CShark/Animales/Comportamiento/Perseguidor.cs b/CShark/Animales/Comportamiento/Perseguidor.cs
@@ -26,14 +26,18 @@ public void Update(float elapsedTime, Animal animal)
 
         public void Render()
         {
-           
+
         }
 
         private void AvanzarHaciaPlayer(float elapsedTime, Animal animal)
         {
             var direccionDespl = Objetivo.Posicion - animal.Posicion;
             var desplazam = direccionDespl * VelocidadMovimiento * 0.1f;
-            animal.Posicion += desplazam;
+            if (direccionDespl.Length() < 100f)
+            {
+                animal.Posicion += desplazam;
+            }
+
         }
 
     }

diff --git a/CShark/Model/GameModel.cs b/CShark/Model/GameModel.cs
@@ -42,6 +42,7 @@ public override void Init() {
             Cursor.Hide();
             PantallaMuerte = new PantallaMuerte();            
             GameManager = new GameManager();
+            D3DDevice.Instance.Device.Transform.Projection = TGCMatrix.PerspectiveFovLH(45, D3DDevice.Instance.AspectRatio, D3DDevice.Instance.ZNearPlaneDistance, 450000f);
             //Casco = new Casco();
             Start();
         }
@@ -84,13 +85,16 @@ public override void Update() {
 
         public override void Render() {
 
+
            // RenderCasco = Configuracion.Instancia.PostProcesadoCasco.Valor && !Player.onPause;
             BackgroundColor = Efectos.Instancia.colorNiebla;
+            ClearTextures();
 
             PreRender();
-            Frustum.updateVolume(TGCMatrix.FromMatrix(D3DDevice.Instance.Device.Transform.View), TGCMatrix.FromMatrix(D3DDevice.Instance.Device.Transform.Projection));
-            Frustum.updateMesh(Player.Posicion, Camara.LookAt, 16.0f / 9, 0, 10000, 70);
-            UpdateFrustum();
+            var FrustumMatrix = TGCMatrix.PerspectiveFovLH(45,D3DDevice.Instance.AspectRatio,D3DDevice.Instance.ZNearPlaneDistance,450f);
+            Frustum.updateVolume(TGCMatrix.FromMatrix(D3DDevice.Instance.Device.Transform.View), TGCMatrix.FromMatrix(FrustumMatrix));
+            Frustum.updateMesh(Player.Posicion, Camara.LookAt, 16.0f / 9, 0, 1000, 70);
+            //UpdateFrustum();
 
             /*if (RenderCasco) {
                 Casco.RenderBeforeScene();

diff --git a/CShark/Optimizaciones/Octree.cs b/CShark/Optimizaciones/Octree.cs
@@ -1,5 +1,6 @@
 using CShark.Objetos;
 using System.Collections.Generic;
+using System.Linq;
 using TGC.Core.BoundingVolumes;
 using TGC.Core.Collision;
 using TGC.Core.Geometry;

diff --git a/CShark/UI/Inventario/MenuInventario.cs b/CShark/UI/Inventario/MenuInventario.cs
@@ -106,7 +106,6 @@ public override void Update(GameModel juego)
             base.Update(juego);
             Botones.ForEach(b => b.Update(juego, this));
             Titulo.Text = Seleccionado.ToString();
-            InfoItem = CantDisponibleDisplay(player);
         }
 
         public new void Dispose()

diff --git a/CShark/Utils/Constants.cs b/CShark/Utils/Constants.cs
@@ -17,12 +17,13 @@ public static class Constants
             "Impulsar hacia la derecha - D",
             "Impulsar hacia adelante - W",
             "Impulsar hacia atrás - S",
-            "Impulsar hacia arriba/Saltar (Fuera del agua) - Space",
-            "Impulsar hacia abajo - X",
-            "Frenar impulso - F",
+            "Impulsar hacia arriba/Saltar - Space",
+            //"Impulsar hacia abajo - X",
+            //"Frenar impulso - F",
             "Disparar - Click derecho",
             "Abrir/Cerrar menús - Esc",
-            "Abrir menú de crafteo - E (Sólo en radio del bote)",
+            "Abrir menú de crafteo - E (Sólo en mesa de crafteo)",
+            "Recoger item - E",
             "Abrir inventario - I"
         };
     }