Merge branch 'master' of https://github.com/tgc-utn/tgc-viewer

tgc-utn · Mar 28, 2018 · ad545fa · ad545fa
2 parents 6a809bd + 367607a
commit ad545fa
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 87 deletions.
diff --git a/TGC.Core/MeshFactory/DefaultMeshFactory.cs b/TGC.Core/MeshFactory/DefaultMeshFactory.cs
@@ -0,0 +1,26 @@
+using Microsoft.DirectX.Direct3D;
+using TGC.Core.Mathematica;
+using TGC.Core.SceneLoader;
+
+namespace TGC.Core.MeshFactory
+{
+    /// <summary>
+    ///     Factory default que crea una instancia de la clase TgcMesh
+    /// </summary>
+    public class DefaultMeshFactory : IMeshFactory
+    {
+        public TgcMesh createNewMesh(Mesh d3dMesh, string meshName, TgcMesh.MeshRenderType renderType)
+        {
+            return new TgcMesh(d3dMesh, meshName, renderType);
+        }
+
+        public TgcMesh createNewMeshInstance(string meshName, TgcMesh originalMesh, TGCVector3 translation,
+            TGCVector3 rotation, TGCVector3 scale)
+        {
+            return new TgcMesh(meshName, originalMesh, translation, rotation, scale);
+        }
+
+
+    }
+
+}
diff --git a/TGC.Core/MeshFactory/DefaultSkeletalMeshFactory.cs b/TGC.Core/MeshFactory/DefaultSkeletalMeshFactory.cs
@@ -0,0 +1,23 @@
+using Microsoft.DirectX.Direct3D;
+using TGC.Core.SceneLoader;
+using TGC.Core.SkeletalAnimation;
+
+namespace TGC.Core.MeshFactory
+{
+    /// <summary>
+    ///     Factory default que crea una instancia de la clase TgcMesh
+    /// </summary>
+    public class DefaultSkeletalMeshFactory: ISkeletalMeshFactory
+    {
+        public TgcMesh createNewMesh(Mesh d3dMesh, string meshName, TgcMesh.MeshRenderType renderType)
+        {
+            return new TgcMesh(d3dMesh, meshName, renderType);
+        }
+
+        public TgcSkeletalMesh createNewSkeletalMesh(Mesh d3dMesh, string meshName,
+            TgcSkeletalMesh.MeshRenderType renderType, TgcSkeletalBone[] bones)
+        {
+            return new TgcSkeletalMesh(d3dMesh, meshName, renderType, bones);
+        }
+    }
+}
diff --git a/TGC.Core/MeshFactory/IMeshFactory.cs b/TGC.Core/MeshFactory/IMeshFactory.cs
@@ -0,0 +1,34 @@
+using Microsoft.DirectX.Direct3D;
+using TGC.Core.Mathematica;
+using TGC.Core.SceneLoader;
+
+namespace TGC.Core.MeshFactory
+{
+    /// <summary>
+    ///     Factory para permitir crear una instancia especifica de la clase TgcMesh
+    /// </summary>
+    public interface IMeshFactory
+    {
+        /// <summary>
+        ///     Crear una nueva instancia de la clase TgcMesh o derivados
+        /// </summary>
+        /// <param name="d3DMesh">Mesh de Direct3D</param>
+        /// <param name="meshName">Nombre de la malla</param>
+        /// <param name="renderType">Tipo de renderizado de la malla</param>
+        /// <returns>Instancia de TgcMesh creada</returns>
+        TgcMesh createNewMesh(Mesh d3DMesh, string meshName, TgcMesh.MeshRenderType renderType);
+
+        /// <summary>
+        ///     Crear una nueva malla que es una instancia de otra malla original.
+        ///     Crear una instancia de la clase TgcMesh o derivados
+        /// </summary>
+        /// <param name="meshName">Nombre de la malla</param>
+        /// <param name="originalMesh">Malla original desde la cual basarse</param>
+        /// <param name="translation">Traslación respecto de la malla original</param>
+        /// <param name="rotation">Rotación respecto de la malla original</param>
+        /// <param name="scale">Escala respecto de la malla original</param>
+        /// <returns>Instancia de TgcMesh creada</returns>
+        TgcMesh createNewMeshInstance(string meshName, TgcMesh originalMesh, TGCVector3 translation, TGCVector3 rotation,
+            TGCVector3 scale);
+    }
+}
diff --git a/TGC.Core/MeshFactory/ISkeletalMeshFactory.cs b/TGC.Core/MeshFactory/ISkeletalMeshFactory.cs
@@ -0,0 +1,29 @@
+using Microsoft.DirectX.Direct3D;
+using TGC.Core.SceneLoader;
+using TGC.Core.SkeletalAnimation;
+
+namespace TGC.Core.MeshFactory
+{
+    public interface ISkeletalMeshFactory
+    {
+        /// <summary>
+        ///     Crear una nueva instancia de la clase TgcMesh o derivados
+        /// </summary>
+        /// <param name="d3DMesh">Mesh de Direct3D</param>
+        /// <param name="meshName">Nombre de la malla</param>
+        /// <param name="renderType">Tipo de renderizado de la malla</param>
+        /// <returns>Instancia de TgcMesh creada</returns>
+        TgcMesh createNewMesh(Mesh d3DMesh, string meshName, TgcMesh.MeshRenderType renderType);
+
+        /// <summary>
+        ///     Crear una nueva instancia de la clase TgcSkeletalMesh o derivados
+        /// </summary>
+        /// <param name="d3DMesh">Mesh de Direct3D</param>
+        /// <param name="meshName">Nombre de la malla</param>
+        /// <param name="renderType">Tipo de renderizado de la malla</param>
+        /// <param name="bones">Huesos de la malla</param>
+        /// <returns>Instancia de TgcMesh creada</returns>
+        TgcSkeletalMesh createNewSkeletalMesh(Mesh d3DMesh, string meshName, TgcSkeletalMesh.MeshRenderType renderType,
+            TgcSkeletalBone[] bones);
+    }
+}
diff --git a/TGC.Core/SceneLoader/TgcSceneLoader.cs b/TGC.Core/SceneLoader/TgcSceneLoader.cs
@@ -6,6 +6,7 @@
 using TGC.Core.BoundingVolumes;
 using TGC.Core.Direct3D;
 using TGC.Core.Mathematica;
+using TGC.Core.MeshFactory;
 using TGC.Core.PortalRendering;
 using TGC.Core.Textures;
 
@@ -735,54 +736,5 @@ public struct DiffuseMapAndLightmapVertex
 
         #endregion Mesh FVF
 
-        #region MeshFactory
-
-        /// <summary>
-        ///     Factory para permitir crear una instancia especifica de la clase TgcMesh
-        /// </summary>
-        public interface IMeshFactory
-        {
-            /// <summary>
-            ///     Crear una nueva instancia de la clase TgcMesh o derivados
-            /// </summary>
-            /// <param name="d3dMesh">Mesh de Direct3D</param>
-            /// <param name="meshName">Nombre de la malla</param>
-            /// <param name="renderType">Tipo de renderizado de la malla</param>
-            /// <param name="meshData">Datos de la malla</param>
-            /// <returns>Instancia de TgcMesh creada</returns>
-            TgcMesh createNewMesh(Mesh d3dMesh, string meshName, TgcMesh.MeshRenderType renderType);
-
-            /// <summary>
-            ///     Crear una nueva malla que es una instancia de otra malla original.
-            ///     Crear una instancia de la clase TgcMesh o derivados
-            /// </summary>
-            /// <param name="name">Nombre de la malla</param>
-            /// <param name="parentInstance">Malla original desde la cual basarse</param>
-            /// <param name="translation">Traslación respecto de la malla original</param>
-            /// <param name="rotation">Rotación respecto de la malla original</param>
-            /// <param name="scale">Escala respecto de la malla original</param>
-            /// <returns>Instancia de TgcMesh creada</returns>
-            TgcMesh createNewMeshInstance(string meshName, TgcMesh originalMesh, TGCVector3 translation, TGCVector3 rotation,
-                TGCVector3 scale);
-        }
-
-        /// <summary>
-        ///     Factory default que crea una instancia de la clase TgcMesh
-        /// </summary>
-        public class DefaultMeshFactory : IMeshFactory
-        {
-            public TgcMesh createNewMesh(Mesh d3dMesh, string meshName, TgcMesh.MeshRenderType renderType)
-            {
-                return new TgcMesh(d3dMesh, meshName, renderType);
-            }
-
-            public TgcMesh createNewMeshInstance(string meshName, TgcMesh originalMesh, TGCVector3 translation,
-                TGCVector3 rotation, TGCVector3 scale)
-            {
-                return new TgcMesh(meshName, originalMesh, translation, rotation, scale);
-            }
-        }
-
-        #endregion MeshFactory
     }
 }
diff --git a/TGC.Core/SkeletalAnimation/TgcSkeletalLoader.cs b/TGC.Core/SkeletalAnimation/TgcSkeletalLoader.cs
@@ -6,6 +6,7 @@
 using TGC.Core.BoundingVolumes;
 using TGC.Core.Direct3D;
 using TGC.Core.Mathematica;
+using TGC.Core.MeshFactory;
 using TGC.Core.SceneLoader;
 using TGC.Core.Textures;
 
@@ -24,14 +25,14 @@ public class TgcSkeletalLoader
         public TgcSkeletalLoader()
         {
             texturesDict = new Dictionary<string, TgcTexture>();
-            MeshFactory = new DefaultMeshFactory();
+            MeshFactory = new DefaultSkeletalMeshFactory();
         }
 
         /// <summary>
         ///     Factory utilizado para crear una instancia de TgcSkeletalMesh.
         ///     Por default se utiliza la clase DefaultMeshFactory.
         /// </summary>
-        public IMeshFactory MeshFactory { get; set; }
+        public ISkeletalMeshFactory MeshFactory { get; set; }
 
         /// <summary>
         ///     Carga un modelo a partir de un archivo
@@ -494,7 +495,7 @@ private TgcSkeletalMesh crearMeshDiffuseMap(TgcSkeletalLoaderMaterialAux[] mater
             }
 
             //Crear mesh de TGC
-            var tgcMesh = MeshFactory.createNewMesh(mesh, meshData.name, TgcSkeletalMesh.MeshRenderType.DIFFUSE_MAP,
+            var tgcMesh = MeshFactory.createNewSkeletalMesh(mesh, meshData.name, TgcSkeletalMesh.MeshRenderType.DIFFUSE_MAP,
                 bones);
             tgcMesh.Materials = meshMaterials;
             tgcMesh.DiffuseMaps = meshTextures;
@@ -598,7 +599,7 @@ private TgcSkeletalMesh crearMeshSoloColor(TgcSkeletalMeshData meshData)
             }
 
             //Crear mesh de TGC
-            var tgcMesh = MeshFactory.createNewMesh(mesh, meshData.name, TgcSkeletalMesh.MeshRenderType.VERTEX_COLOR,
+            var tgcMesh = MeshFactory.createNewSkeletalMesh(mesh, meshData.name, TgcSkeletalMesh.MeshRenderType.VERTEX_COLOR,
                 bones);
             return tgcMesh;
         }
@@ -763,37 +764,5 @@ public struct DiffuseMapVertex
 
         #endregion Mesh FVF
 
-        #region MeshFactory
-
-        /// <summary>
-        ///     Factory para permitir crear una instancia especifica de la clase TgcMesh
-        /// </summary>
-        public interface IMeshFactory
-        {
-            /// <summary>
-            ///     Crear una nueva instancia de la clase TgcSkeletalMesh o derivados
-            /// </summary>
-            /// <param name="d3dMesh">Mesh de Direct3D</param>
-            /// <param name="meshName">Nombre de la malla</param>
-            /// <param name="renderType">Tipo de renderizado de la malla</param>
-            /// <param name="bones">Huesos de la malla</param>
-            /// <returns>Instancia de TgcMesh creada</returns>
-            TgcSkeletalMesh createNewMesh(Mesh d3dMesh, string meshName, TgcSkeletalMesh.MeshRenderType renderType,
-                TgcSkeletalBone[] bones);
-        }
-
-        /// <summary>
-        ///     Factory default que crea una instancia de la clase TgcMesh
-        /// </summary>
-        public class DefaultMeshFactory : IMeshFactory
-        {
-            public TgcSkeletalMesh createNewMesh(Mesh d3dMesh, string meshName,
-                TgcSkeletalMesh.MeshRenderType renderType, TgcSkeletalBone[] bones)
-            {
-                return new TgcSkeletalMesh(d3dMesh, meshName, renderType, bones);
-            }
-        }
-
-        #endregion MeshFactory
     }
 }
diff --git a/TGC.Core/TGC.Core.csproj b/TGC.Core/TGC.Core.csproj
@@ -72,6 +72,10 @@
     <Compile Include="Mathematica\TGCVector2.cs" />
     <Compile Include="Mathematica\TGCVector3.cs" />
     <Compile Include="Mathematica\TGCVector4.cs" />
+    <Compile Include="MeshFactory\DefaultMeshFactory.cs" />
+    <Compile Include="MeshFactory\DefaultSkeletalMeshFactory.cs" />
+    <Compile Include="MeshFactory\IMeshFactory.cs" />
+    <Compile Include="MeshFactory\ISkeletalMeshFactory.cs" />
     <Compile Include="Text\TgcText2D.cs" />
     <Compile Include="Camara\TgcCamera.cs" />
     <Compile Include="Direct3D\D3DDevice.cs" />

diff --git a/TGC.Examples/Lights/TgcMeshBumpMapping.cs b/TGC.Examples/Lights/TgcMeshBumpMapping.cs
@@ -2,6 +2,7 @@
 using System;
 using TGC.Core.Direct3D;
 using TGC.Core.Mathematica;
+using TGC.Core.MeshFactory;
 using TGC.Core.SceneLoader;
 using TGC.Core.Textures;
 
@@ -398,7 +399,7 @@ public struct BumpMappingVertex
     /// <summary>
     ///     Factory customizado para poder crear clase TgcMeshBumpMapping
     /// </summary>
-    public class TgcMeshBumpMappingFactory : TgcSceneLoader.IMeshFactory
+    public class TgcMeshBumpMappingFactory : IMeshFactory
     {
         public TgcMesh createNewMesh(Mesh d3dMesh, string meshName, TgcMesh.MeshRenderType renderType)
         {

diff --git a/TGC.Examples/MeshExamples/EjemploCustomMesh.cs b/TGC.Examples/MeshExamples/EjemploCustomMesh.cs
@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using TGC.Core.Direct3D;
 using TGC.Core.Mathematica;
+using TGC.Core.MeshFactory;
 using TGC.Core.SceneLoader;
 using TGC.Examples.Camara;
 using TGC.Examples.Example;
@@ -118,7 +119,7 @@ public MyCustomMesh(string name, TgcMesh parentInstance, TGCVector3 translation,
     ///     Debe implementar la interfaz TgcSceneLoader.IMeshFactory
     ///     En ambos métodos crea una instancia de MyCustomMesh.
     /// </summary>
-    public class MyCustomMeshFactory : TgcSceneLoader.IMeshFactory
+    public class MyCustomMeshFactory : IMeshFactory
     {
         public TgcMesh createNewMesh(Mesh d3dMesh, string meshName, TgcMesh.MeshRenderType renderType)
         {