diff --git a/port/Assimp.NET/Assimp.NET/Animation.cs b/port/Assimp.NET/Assimp.NET/Animation.cs
index e11233f29..ef25ee158 100644
--- a/port/Assimp.NET/Assimp.NET/Animation.cs
+++ b/port/Assimp.NET/Assimp.NET/Animation.cs
@@ -48,5 +48,49 @@ namespace Assimp.NET
{
public class Animation
{
+ public Animation()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public BoneAnim getBoneAnimChannel(int i)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public BoneAnim[] gebBoneAnimChannels()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public double getDuration()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getNumBoneAnimChannels()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public double getTicksPerSecond()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Animation)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Assimp.NET.csproj b/port/Assimp.NET/Assimp.NET/Assimp.NET.csproj
index b1d54e6f9..f0f49f393 100644
--- a/port/Assimp.NET/Assimp.NET/Assimp.NET.csproj
+++ b/port/Assimp.NET/Assimp.NET/Assimp.NET.csproj
@@ -10,7 +10,7 @@
Properties
Assimp.NET
Assimp.NET
- v2.0
+ v3.5
512
@@ -32,26 +32,34 @@
+
+ 3.5
+
+
+
+
-
+
+
+
diff --git a/port/Assimp.NET/Assimp.NET/Bone.cs b/port/Assimp.NET/Assimp.NET/Bone.cs
index 01c4e9e0f..7beb80c3a 100644
--- a/port/Assimp.NET/Assimp.NET/Bone.cs
+++ b/port/Assimp.NET/Assimp.NET/Bone.cs
@@ -45,7 +45,57 @@ using System.Text;
namespace Assimp.NET
{
- class Bone
+ public class Bone
{
+ public Bone()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public String getName()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getNumWeights()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Bone.Weight getWeight(int weight)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Bone.Weight[] getWeightsArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public class Weight
+ {
+ Weight()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int index;
+ public float weight;
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Bone)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/CompressedTexture.cs b/port/Assimp.NET/Assimp.NET/CompressedTexture.cs
index 17520ecef..99a63cf53 100644
--- a/port/Assimp.NET/Assimp.NET/CompressedTexture.cs
+++ b/port/Assimp.NET/Assimp.NET/CompressedTexture.cs
@@ -42,10 +42,75 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
using System.Collections.Generic;
using System.Text;
+using System.Drawing;
namespace Assimp.NET
{
- class CompressedTexture
+ public class CompressedTexture : Texture
{
+ public CompressedTexture()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override Bitmap ConvertToImage()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Color[] getColorArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public byte[] getData()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public String getFormat()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getHeight()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getLength()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override Color getPixel(int x, int y)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getWidth()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override bool hasAlphaChannel
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (CompressedTexture)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/DefaultLogger.cs b/port/Assimp.NET/Assimp.NET/DefaultLogger.cs
index 83646791f..4142e3955 100644
--- a/port/Assimp.NET/Assimp.NET/DefaultLogger.cs
+++ b/port/Assimp.NET/Assimp.NET/DefaultLogger.cs
@@ -45,7 +45,155 @@ using System.Text;
namespace Assimp.NET
{
- class DefaultLogger
+ public class DefaultLogger : Logger
{
+ private DefaultLogger()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static int LOGSEVERITY_NORMAL;
+ public static int LOGSEVERITY_VERBOSE;
+
+ public static void NativeCallWriteDebug()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static void NativeCallWriteError()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static void NativeCallWriteInfo()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static void NativeCallWriteWarn()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static void create()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static void create(String file, bool bErrorOut)
+ {
+ throw new System.NotImplementedException();
+ }
+
+
+ public static Logger logger
+ {
+ get
+ {
+ throw new System.NotImplementedException();
+ }
+ set
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+
+ public static bool isNullLogger()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static void kill()
+ {
+ throw new System.NotImplementedException();
+ }
+
+
+ public class FileStreamWrapper
+ {
+ public FileStreamWrapper(/*FileStream*/)
+ {
+ throw new System.NotImplementedException();
+ }
+ /*
+ public FileWriter getStream
+ {
+ throw new System.NotImplementedException(); {
+ }
+ */
+
+ public void write(String message)
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+
+ public class StreamWrapper
+ {
+ public StreamWrapper(/*OutputStream*/)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ /*
+ public OutputStream getStream()
+ {
+ throw new System.NotImplementedException();
+ }
+ */
+
+ public void write(String message)
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+
+ private Logger _logger;
+
+
+ public override void attachStream(LogStream stream, int severity)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override void detachStream(LogStream stream, int severity)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override void debug(string message)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override void error(string message)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override void info(string message)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override void warn(string message)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (DefaultLogger)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/IOStream.cs b/port/Assimp.NET/Assimp.NET/IOStream.cs
index 1f57d67e5..1c8427afc 100644
--- a/port/Assimp.NET/Assimp.NET/IOStream.cs
+++ b/port/Assimp.NET/Assimp.NET/IOStream.cs
@@ -45,7 +45,7 @@ using System.Text;
namespace Assimp.NET
{
- class IOStream
+ public interface IOStream
{
}
}
diff --git a/port/Assimp.NET/Assimp.NET/IOSystem.cs b/port/Assimp.NET/Assimp.NET/IOSystem.cs
index 407763e17..45dd89b40 100644
--- a/port/Assimp.NET/Assimp.NET/IOSystem.cs
+++ b/port/Assimp.NET/Assimp.NET/IOSystem.cs
@@ -45,7 +45,9 @@ using System.Text;
namespace Assimp.NET
{
- class IOSystem
+ public interface IOSystem
{
+ bool Exists(String file);
+ bool Open(String file);
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Importer.cs b/port/Assimp.NET/Assimp.NET/Importer.cs
index 165b349ab..64160c438 100644
--- a/port/Assimp.NET/Assimp.NET/Importer.cs
+++ b/port/Assimp.NET/Assimp.NET/Importer.cs
@@ -45,7 +45,83 @@ using System.Text;
namespace Assimp.NET
{
- class Importer
+ public class Importer
{
+ public Importer()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Importer(int version)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static int PROPERTY_WAS_NOT_EXISTING;
+
+ public bool addPostProcessStep(PostProcessStep ppStep)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public long getContext()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public IOStream getIOSystem()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getPropertyInt(String property)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getPropertyInt(String property, int error_return)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public bool isDefaultIOSystem()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public bool isPostProcessStepActive(PostProcessStep ppStep)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Scene readFile(String path)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public bool removePostProcessStep(PostProcessStep ppStep)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int setPropertyInt(String property, int val)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Importer)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/LogStream.cs b/port/Assimp.NET/Assimp.NET/LogStream.cs
index eb16173d3..89a45c2b2 100644
--- a/port/Assimp.NET/Assimp.NET/LogStream.cs
+++ b/port/Assimp.NET/Assimp.NET/LogStream.cs
@@ -45,7 +45,8 @@ using System.Text;
namespace Assimp.NET
{
- class LogStream
+ public interface LogStream
{
+ void write(String message);
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Logger.cs b/port/Assimp.NET/Assimp.NET/Logger.cs
index c2d36fd69..cd64f3188 100644
--- a/port/Assimp.NET/Assimp.NET/Logger.cs
+++ b/port/Assimp.NET/Assimp.NET/Logger.cs
@@ -45,7 +45,33 @@ using System.Text;
namespace Assimp.NET
{
- class Logger
+ public abstract class Logger
{
+ public static int ERRORSEVERITY_DEBUGGING;
+ public static int ERRORSEVERITY_ERROR;
+ public static int ERRORSEVERITY_INFO;
+ public static int ERRORSEVERITY_WARNING;
+
+ public abstract void attachStream(LogStream stream, int severity);
+ public abstract void detachStream(LogStream stream, int severity);
+ public abstract void debug(String message);
+ public abstract void error(String message);
+ public abstract void info(String message);
+ public abstract void warn(String message);
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Logger)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Material.cs b/port/Assimp.NET/Assimp.NET/Material.cs
index d98374f8c..0a71df04a 100644
--- a/port/Assimp.NET/Assimp.NET/Material.cs
+++ b/port/Assimp.NET/Assimp.NET/Material.cs
@@ -45,7 +45,103 @@ using System.Text;
namespace Assimp.NET
{
- class Material
+ public class Material
{
+ public class Property
+ {
+ public String key;
+ public Object value;
+ }
+
+ public class PropertyNotFoundException : Exception
+ {
+ public PropertyNotFoundException(String message, String key)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public String property_key;
+ }
+
+ public static String MATKEY_COLOR_AMBIENT;
+ public static String MATKEY_COLOR_DIFFUSE;
+ public static String MATKEY_COLOR_EMISSIVE;
+ public static String MATKEY_COLOR_SPECULAR;
+ public static String MATKEY_NAME;
+
+ public Property[] properties
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public Material()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Object getProperty(String key)
+ {
+ throw new System.NotImplementedException();
+ }
+ public float getPropertyAsFloat(String key)
+ {
+ throw new System.NotImplementedException();
+ }
+ public float[] getPropertyAsFloatArray(String key)
+ {
+ throw new System.NotImplementedException();
+ }
+ public int getPropertyAsInt(String key)
+ {
+ throw new System.NotImplementedException();
+ }
+ public String getPropertyAsString(String key)
+ {
+ throw new System.NotImplementedException();
+ }
+ public static String MATKEY_TEXOP_AMBIENT(int N)
+ {
+ throw new System.NotImplementedException();
+ }
+ public static String MATKEY_TEXOP_DIFFUSE(int N)
+ {
+ throw new System.NotImplementedException();
+ }
+ public static String MATKEY_TEXOP_HEIGTH(int N)
+ {
+ throw new System.NotImplementedException();
+ }
+ public static String MATKEY_TEXOP_NORMALS(int N)
+ {
+ throw new System.NotImplementedException();
+ }
+ public static String MATKEY_TEXOP_OPACITY(int N)
+ {
+ throw new System.NotImplementedException();
+ }
+ public static String MATKEY_TEXOP_SHININESS(int N)
+ {
+ throw new System.NotImplementedException();
+ }
+ public static String MATKEY_TEXOP_SPECULAR(int N)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Material)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
+
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Mesh.cs b/port/Assimp.NET/Assimp.NET/Mesh.cs
index bdc5daf11..d68724355 100644
--- a/port/Assimp.NET/Assimp.NET/Mesh.cs
+++ b/port/Assimp.NET/Assimp.NET/Mesh.cs
@@ -45,7 +45,200 @@ using System.Text;
namespace Assimp.NET
{
- class Mesh
+ public class Mesh
{
+ public static int MAX_NUMBER_OF_COLOR_SETS;
+ public static int MAX_NUMBER_OF_TEXTURECOORDS;
+
+ public Mesh()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getBitangent(int Index, float[] Out)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getBitangent(int Index, float[] Out, int OutBase)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public float[] getBitangetArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Bone getBone(int i)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Bone[] getBonesArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getFace(int Index, int[] Out)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getFace(int Index, int[] Out, int OutBase)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int[] getFaceArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getMaterialIndex()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getNormal(int Index, float[] Out)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getNormal(int Index, float[] Out, int OutBase)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public float[] getNormalArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getNumBones()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getNumFaces()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getNumVertices()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getPosition(int Index, float[] Out)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getPosition(int Index, float[] Out, int OutBase)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public float[] getPositionArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getTangent(int Index, float[] Out)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getTangent(int Index, float[] Out, int OutBase)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public float[] getTangentArray()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getTexCoord(int channel, int Index, float[] Out)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getTexCoord(int channel, int Index, float[] Out, int OutBase)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public float[] getTexCoordArray(int channel)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public System.Drawing.Color getVertexColor(int channel, int Index)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getVertexColor(int channel, int Index, float[] Out)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void getVertexColor(int channel, int Index, float[] Out, int OutBase)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public float[] getVertexColorArray(int channel)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public bool hasBones
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public bool hasNormals
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public bool hasPositions
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public bool hasTangentsAndBitangets
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public bool hasUVCoords
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public bool hasVertexColors
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Mesh)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
+
}
}
diff --git a/port/Assimp.NET/Assimp.NET/NativeError.cs b/port/Assimp.NET/Assimp.NET/NativeError.cs
index d453c242c..ea7ec8ccc 100644
--- a/port/Assimp.NET/Assimp.NET/NativeError.cs
+++ b/port/Assimp.NET/Assimp.NET/NativeError.cs
@@ -45,7 +45,31 @@ using System.Text;
namespace Assimp.NET
{
- class NativeError
+ public class NativeError : Exception
{
+ public NativeError()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public NativeError(String error)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (NativeError)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Node.cs b/port/Assimp.NET/Assimp.NET/Node.cs
index 9c8c82519..78b00ffe4 100644
--- a/port/Assimp.NET/Assimp.NET/Node.cs
+++ b/port/Assimp.NET/Assimp.NET/Node.cs
@@ -45,7 +45,71 @@ using System.Text;
namespace Assimp.NET
{
- class Node
+ public class Node
{
+ public Node(Node parent)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Node findNode(String name)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Node[] getCildren()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int[] getMeshes()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public String getName()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getNumChildren()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public int getNumMeshes()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Node getParent()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Matrix4x4 getTransformColumnMajor()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Matrix4x4 getTransformRowMajor()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Node)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/PostProcessStep.cs b/port/Assimp.NET/Assimp.NET/PostProcessStep.cs
index 61df167a4..cc3286496 100644
--- a/port/Assimp.NET/Assimp.NET/PostProcessStep.cs
+++ b/port/Assimp.NET/Assimp.NET/PostProcessStep.cs
@@ -45,7 +45,43 @@ using System.Text;
namespace Assimp.NET
{
- class PostProcessStep
+ public class PostProcessStep
{
+ private PostProcessStep(String name)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static readonly PostProcessStep CalcTangetSpace = new PostProcessStep("CalcTangentSpace");
+ public static readonly PostProcessStep ConvertToLeftHanded = new PostProcessStep("ConvertToLeftHanded");
+ public static readonly PostProcessStep FixInfacingNormals = new PostProcessStep("FixInfacingNormals");
+ public static readonly PostProcessStep GenFaceNormals = new PostProcessStep("GenFaceNormals");
+ public static readonly PostProcessStep GenSmoothNormals = new PostProcessStep("GenSmoothNormals");
+ public static readonly PostProcessStep ImproveVertexLocality = new PostProcessStep("ImproveVertexLocality");
+ public static readonly PostProcessStep JoinIdenticalVertices = new PostProcessStep("JoinIdenticalVertices");
+ public static readonly PostProcessStep KillNormals = new PostProcessStep("KillNormals");
+ public static readonly PostProcessStep LimitBoneWeights = new PostProcessStep("LimitBoneWeights");
+ public static readonly PostProcessStep PreTransformVertices = new PostProcessStep("PreTransformVertices");
+ public static readonly PostProcessStep SplitLargeMeshes = new PostProcessStep("SplitLargeMeshes");
+ public static readonly PostProcessStep VladiateDataStructure = new PostProcessStep("VladiateDataStructure");
+
+ public static readonly int DEFAULT_VERTEX_SPLIT_LIMIT = 1000000;
+ public static readonly int DEFAULT_TRIANGLE_SPLIT_LIMIT = 1000000;
+ public static readonly int DEFAULT_BONE_WEIGHT_LIMIT = 4;
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (PostProcessStep)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Scene.cs b/port/Assimp.NET/Assimp.NET/Scene.cs
index 385ddcc09..c9102f6ef 100644
--- a/port/Assimp.NET/Assimp.NET/Scene.cs
+++ b/port/Assimp.NET/Assimp.NET/Scene.cs
@@ -45,7 +45,83 @@ using System.Text;
namespace Assimp.NET
{
- class Scene
+ public class Scene
{
+ public static readonly int FLAG_ANIM_SKELETON_ONLY = 0x1;
+
+ protected Scene(Importer importer)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Animation[] Animations
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public int Flags
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public Material[] Materials
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public Mesh getMesh(int i)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Mesh[] Meshes
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public int NumAnimations
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public int NumMeshes
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public int NumTextures
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public Node RootNode
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public Texture getTexture(int i)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public Texture[] Textures
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Scene)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/ShadingMode.cs b/port/Assimp.NET/Assimp.NET/ShadingMode.cs
index 3f0023395..f9acc0b19 100644
--- a/port/Assimp.NET/Assimp.NET/ShadingMode.cs
+++ b/port/Assimp.NET/Assimp.NET/ShadingMode.cs
@@ -45,7 +45,37 @@ using System.Text;
namespace Assimp.NET
{
- class ShadingMode
+ public class ShadingMode
{
+ private ShadingMode Mode()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static readonly int Flat = 0x1;
+ public static readonly int Gouraud = 0x2;
+ public static readonly int Phong = 0x3;
+ public static readonly int Blinn = 0x4;
+ public static readonly int Toon = 0x5;
+ public static readonly int OrenNayar = 0x6;
+ public static readonly int Minnaert = 0x7;
+ public static readonly int CookTorrance = 0x8;
+ public static readonly int NoShading = 0x9;
+
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (ShadingMode)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/Texture.cs b/port/Assimp.NET/Assimp.NET/Texture.cs
index a1ba55a3b..80bf902fe 100644
--- a/port/Assimp.NET/Assimp.NET/Texture.cs
+++ b/port/Assimp.NET/Assimp.NET/Texture.cs
@@ -42,10 +42,62 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
using System.Collections.Generic;
using System.Text;
+using System.Drawing;
namespace Assimp.NET
{
- class Texture
+ public class Texture
{
+ protected int _width;
+ protected int _heigth;
+ protected int _needAlpha;
+
+ protected Object _data;
+
+ public int Height
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public int Width
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public virtual bool hasAlphaChannel
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public Color[] ColorArray
+ {
+ get { throw new System.NotImplementedException(); }
+ }
+
+ public virtual Color getPixel(int x, int y)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public virtual Bitmap ConvertToImage()
+ {
+ throw new System.NotImplementedException();
+ }
+
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (Texture)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/TextureMapMode.cs b/port/Assimp.NET/Assimp.NET/TextureMapMode.cs
index ae29f8ca5..f5d070aae 100644
--- a/port/Assimp.NET/Assimp.NET/TextureMapMode.cs
+++ b/port/Assimp.NET/Assimp.NET/TextureMapMode.cs
@@ -45,7 +45,25 @@ using System.Text;
namespace Assimp.NET
{
- class TextureMapMode
+ public class TextureMapMode
{
+ public static readonly int Wrap = 0x0;
+ public static readonly int Clamp = 0x1;
+ public static readonly int Mirror = 0x2;
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (TextureMapMode) obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/port/Assimp.NET/Assimp.NET/TextureOp.cs b/port/Assimp.NET/Assimp.NET/TextureOp.cs
index a49e43b2f..d27c7cac5 100644
--- a/port/Assimp.NET/Assimp.NET/TextureOp.cs
+++ b/port/Assimp.NET/Assimp.NET/TextureOp.cs
@@ -45,7 +45,33 @@ using System.Text;
namespace Assimp.NET
{
- class TextureOp
+ public class TextureOp
{
+ private TextureOp()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public static int Add = 0x0;
+ public static int Multiply = 0x1;
+ public static int Subtract = 0x2;
+ public static int Divide = 0x3;
+ public static int SmoothAdd = 0x4;
+ public static int SignedAdd = 0x5;
+
+ public override int GetHashCode()
+ {
+ return base.GetHashCode();
+ }
+
+ public override bool Equals(object obj)
+ {
+ return (TextureOp)obj == this;
+ }
+
+ public override string ToString()
+ {
+ throw new System.NotImplementedException();
+ }
}
}
diff --git a/workspaces/vc9/UnitTest.vcproj b/workspaces/vc9/UnitTest.vcproj
index 426c0ecdf..617d86b79 100644
--- a/workspaces/vc9/UnitTest.vcproj
+++ b/workspaces/vc9/UnitTest.vcproj
@@ -348,7 +348,6 @@
>
+
+
+
+
@@ -689,99 +696,103 @@
RelativePath="..\..\test\unit\utJoinVertices.cpp"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/workspaces/vc9/assimp.sln b/workspaces/vc9/assimp.sln
index e963a52fa..a935f72b4 100644
--- a/workspaces/vc9/assimp.sln
+++ b/workspaces/vc9/assimp.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
+# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssimpView", "assimp_view.vcproj", "{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}"
ProjectSection(ProjectDependencies) = postProject
{5691E159-2D9B-407F-971F-EA5C592DC524} = {5691E159-2D9B-407F-971F-EA5C592DC524}
@@ -13,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest.vcproj
{5691E159-2D9B-407F-971F-EA5C592DC524} = {5691E159-2D9B-407F-971F-EA5C592DC524}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jAssimp", "jAssimp.vcproj", "{FE78BFBA-4BA5-457D-8602-B800D498102D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jAssimp_NOT_WORKING", "jAssimp.vcproj", "{FE78BFBA-4BA5-457D-8602-B800D498102D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,18 +27,18 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.ActiveCfg = Debug|Win32
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.Build.0 = Debug|Win32
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.ActiveCfg = Debug|x64
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.Build.0 = Debug|x64
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.ActiveCfg = Debug_DLL|Win32
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.Build.0 = Debug_DLL|Win32
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.ActiveCfg = Debug_DLL|x64
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.Build.0 = Debug_DLL|x64
{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|Win32.ActiveCfg = Debug|Win32
{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|Win32.Build.0 = Debug|Win32
{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|x64.ActiveCfg = Debug|x64
{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|x64.Build.0 = Debug|x64
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.ActiveCfg = Release|Win32
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.Build.0 = Release|Win32
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.ActiveCfg = Release|x64
- {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.Build.0 = Release|x64
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.ActiveCfg = Release_DLL|Win32
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.Build.0 = Release_DLL|Win32
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.ActiveCfg = Release_DLL|x64
+ {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.Build.0 = Release_DLL|x64
{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|Win32.ActiveCfg = Release|Win32
{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|Win32.Build.0 = Release|Win32
{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|x64.ActiveCfg = Release|x64
@@ -76,13 +76,15 @@ Global
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.ActiveCfg = Release|x64
{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.Build.0 = Release|x64
{FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|Win32.ActiveCfg = Debug|Win32
- {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|x64.ActiveCfg = Debug|Win32
+ {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|x64.ActiveCfg = Debug|x64
{FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug|Win32.ActiveCfg = Debug|Win32
- {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug|x64.ActiveCfg = Debug|Win32
+ {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug|x64.ActiveCfg = Debug|x64
+ {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug|x64.Build.0 = Debug|x64
{FE78BFBA-4BA5-457D-8602-B800D498102D}.Release_DLL|Win32.ActiveCfg = Release|Win32
- {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release_DLL|x64.ActiveCfg = Release|Win32
+ {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release_DLL|x64.ActiveCfg = Release|x64
{FE78BFBA-4BA5-457D-8602-B800D498102D}.Release|Win32.ActiveCfg = Release|Win32
- {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release|x64.ActiveCfg = Release|Win32
+ {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release|x64.ActiveCfg = Release|x64
+ {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/workspaces/vc9/assimp.suo b/workspaces/vc9/assimp.suo
index 720cbd093..7c5e59335 100644
Binary files a/workspaces/vc9/assimp.suo and b/workspaces/vc9/assimp.suo differ
diff --git a/workspaces/vc9/assimp.vcproj b/workspaces/vc9/assimp.vcproj
index d8fa05a28..ab72857fb 100644
--- a/workspaces/vc9/assimp.vcproj
+++ b/workspaces/vc9/assimp.vcproj
@@ -299,6 +299,7 @@
AdditionalIncludeDirectories=""
PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
StringPooling="true"
+ RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
WarningLevel="3"
@@ -340,7 +341,7 @@
/>
+
+
@@ -694,12 +700,28 @@
+
+
+
+
+
+
+
+
@@ -709,41 +731,37 @@
>
-
-
+
+
+
+
-
-
-
-
@@ -753,47 +771,35 @@
>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -882,10 +876,18 @@
+
+
+
+
@@ -894,10 +896,18 @@
+
+
+
+
@@ -910,6 +920,10 @@
RelativePath="..\..\code\HMPFileData.h"
>
+
+
@@ -918,14 +932,26 @@
+
+
+
+
+
+
+
+
@@ -950,6 +980,10 @@
RelativePath="..\..\code\MD3FileData.h"
>
+
+
@@ -958,10 +992,18 @@
+
+
+
+
@@ -974,6 +1016,10 @@
RelativePath="..\..\code\MDCFileData.h"
>
+
+
@@ -998,16 +1044,16 @@
RelativePath="..\..\code\MDLFileData.h"
>
+
+
-
-
@@ -1018,14 +1064,26 @@
RelativePath="..\..\code\ObjFileData.h"
>
+
+
+
+
+
+
@@ -1038,10 +1096,18 @@
+
+
+
+
@@ -1050,6 +1116,10 @@
+
+
@@ -1058,6 +1128,10 @@
+
+
@@ -1070,10 +1144,18 @@
RelativePath="..\..\code\XFileHelper.h"
>
+
+
+
+
@@ -1082,6 +1164,10 @@
+
+
@@ -1090,327 +1176,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1418,7 +1192,199 @@
RelativePath="..\..\code\NFFLoader.cpp"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -351,18 +672,38 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
+
+
+
+
+
+
+
+
+
+
@@ -375,18 +716,34 @@
RelativePath="..\..\tools\assimp_view\LogDisplay.cpp"
>
+
+
+
+
+
+
+
+
@@ -399,10 +756,22 @@
RelativePath="..\..\tools\assimp_view\Normals.cpp"
>
+
+
+
+
+
+
@@ -438,60 +807,38 @@
UsePrecompiledHeader="1"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -196,6 +362,10 @@
RelativePath="..\..\port\jAssimp\jni_bridge\JNIEnvironment.cpp"
>
+
+
@@ -208,6 +378,10 @@
RelativePath="..\..\port\jAssimp\jni_bridge\JNILogger.cpp"
>
+
+
@@ -232,20 +406,6 @@
RelativePath="..\..\port\jAssimp\jni_bridge\JNITexture.cpp"
>
-
-
-
-
-
-
@@ -253,26 +413,8 @@
RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Importer.h"
>
-
-
-
-
-
-
-
-