Updating VC9 workspaces

Adding Class definitions for Assimp.NET
No Documentation an Implementation so far

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@171 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

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();
+        }
     }
 }

port/Assimp.NET/Assimp.NET/Assimp.NET.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Assimp.NET</RootNamespace>
     <AssemblyName>Assimp.NET</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,26 +32,34 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Animation.cs" />
     <Compile Include="Bone.cs" />
+    <Compile Include="BoneAnim.cs" />
     <Compile Include="CompressedTexture.cs" />
+    <Compile Include="ConfigProperty.cs" />
     <Compile Include="DefaultLogger.cs" />
     <Compile Include="Importer.cs" />
     <Compile Include="IOStream.cs" />
     <Compile Include="IOSystem.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="LogStream.cs" />
-    <Compile Include="Mappable.cs" />
     <Compile Include="Material.cs" />
+    <Compile Include="Matrix3x3.cs" />
+    <Compile Include="Matrix4x4.cs" />
     <Compile Include="Mesh.cs" />
     <Compile Include="NativeError.cs" />
     <Compile Include="Node.cs" />
     <Compile Include="PostProcessStep.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Quaternion.cs" />
     <Compile Include="Scene.cs" />
     <Compile Include="ShadingMode.cs" />
     <Compile Include="Texture.cs" />

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();
+        }
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

port/Assimp.NET/Assimp.NET/IOStream.cs

@@ -45,7 +45,7 @@ using System.Text;
 
 namespace Assimp.NET
 {
-    class IOStream
+    public interface IOStream
     {
     }
 }

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);
     }
 }

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();
+        }
     }
 }

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);
     }
 }

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();
+        }
     }
 }

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();
+        }
+
     }
 }

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();
+        }
+
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

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();
+        }
     }
 }

workspaces/vc9/UnitTest.vcproj

@@ -348,7 +348,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="false"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -366,7 +365,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\code;..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -445,7 +444,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\code;..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -525,7 +524,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -606,7 +605,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -677,10 +676,18 @@
 				RelativePath="..\..\test\unit\utGenNormals.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utGenNormals.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utImporter.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utImporter.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utImproveCacheLocality.cpp"
 				>
@@ -689,99 +696,103 @@
 				RelativePath="..\..\test\unit\utJoinVertices.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\test\unit\utLimitBoneWeights.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utMaterialSystem.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utOptimizeGraph.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utPretransformVertices.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utRemoveComments.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utRemoveRedundantMaterials.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utSplitLargeMeshes.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utTextureTransform.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utVertexTriangleAdjacency.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\test\unit\utGenNormals.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\unit\utImporter.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\test\unit\utJoinVertices.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utLimitBoneWeights.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utLimitBoneWeights.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utMaterialSystem.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utMaterialSystem.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utOptimizeGraph.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utOptimizeGraph.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utPretransformVertices.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utPretransformVertices.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utRemoveComments.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utRemoveComments.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utRemoveRedundantMaterials.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utRemoveRedundantMaterials.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utSharedPPData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\test\unit\utSharedPPData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\test\unit\utSortByPType.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\test\unit\utSortByPType.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\test\unit\utSplitLargeMeshes.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utSplitLargeMeshes.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\test\unit\utTextureTransform.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\test\unit\utTriangulate.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\test\unit\utTriangulate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\test\unit\utVertexTriangleAdjacency.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\test\unit\utVertexTriangleAdjacency.h"
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="resources"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

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.ActiveCfg = Debug_DLL|Win32
-		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.Build.0 = Debug|Win32
+		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.Build.0 = Debug_DLL|Win32
-		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.ActiveCfg = Debug|x64
+		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.ActiveCfg = Debug_DLL|x64
-		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.Build.0 = Debug|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.ActiveCfg = Release_DLL|Win32
-		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.Build.0 = Release|Win32
+		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.Build.0 = Release_DLL|Win32
-		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.ActiveCfg = Release|x64
+		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.ActiveCfg = Release_DLL|x64
-		{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.Build.0 = Release|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

workspaces/vc9/assimp_view.vcproj

@@ -190,7 +190,6 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -342,6 +341,328 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_DLL|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="d3d9.lib d3dx9.lib comdlg32.lib assimp.lib winmm.lib comctl32.lib user32.lib advapi32.lib shell32.lib Gdi32.lib"
+				OutputFile="$(OutDir)\assimpview32.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\lib\assimp_release_dll_win32;&quot;$(DXSDK_DIR)lib\x86&quot;"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_DLL|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="d3d9.lib d3dx9.lib comdlg32.lib assimp.lib winmm.lib comctl32.lib user32.lib advapi32.lib shell32.lib Gdi32.lib"
+				OutputFile="$(OutDir)\assimpview64.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\lib\assimp_release_dll_x64;&quot;$(DXSDK_DIR)lib\x64&quot;"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_DLL|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="d3d9.lib d3dx9.lib comdlg32.lib assimp.lib winmm.lib comctl32.lib user32.lib advapi32.lib shell32.lib Gdi32.lib"
+				OutputFile="$(OutDir)\assimpview32d.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\lib\assimp_debug_dll_win32;&quot;$(DXSDK_DIR)lib\x86&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_DLL|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="d3d9.lib d3dx9.lib comdlg32.lib assimp.lib winmm.lib comctl32.lib user32.lib advapi32.lib shell32.lib Gdi32.lib"
+				OutputFile="$(OutDir)\assimpview64d.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\lib\assimp_debug_dll_x64;&quot;$(DXSDK_DIR)lib\x64&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -351,18 +672,38 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\tools\assimp_view\AssetHelper.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\assimp_view.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\assimp_view.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\Background.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\Background.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\Camera.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\Display.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\Display.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\HelpDialog.cpp"
 				>
@@ -375,18 +716,34 @@
 				RelativePath="..\..\tools\assimp_view\LogDisplay.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\LogDisplay.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\LogWindow.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\LogWindow.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\Material.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\MaterialManager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\MeshRenderer.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\MeshRenderer.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\MessageProc.cpp"
 				>
@@ -399,10 +756,22 @@
 				RelativePath="..\..\tools\assimp_view\Normals.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\RenderOptions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\Resource.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\Shaders.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\Shaders.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\stdafx.cpp"
 				>
@@ -438,60 +807,38 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
-			</File>
+				<FileConfiguration
-		</Filter>
+					Name="Release_DLL|Win32"
-		<Filter
+					>
-			Name="headers"
+					<Tool
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+						Name="VCCLCompilerTool"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+						UsePrecompiledHeader="1"
-			>
+					/>
-			<File
+				</FileConfiguration>
-				RelativePath="..\..\tools\assimp_view\AssetHelper.h"
+				<FileConfiguration
-				>
+					Name="Release_DLL|x64"
-			</File>
+					>
-			<File
+					<Tool
-				RelativePath="..\..\tools\assimp_view\assimp_view.h"
+						Name="VCCLCompilerTool"
-				>
+						UsePrecompiledHeader="1"
-			</File>
+					/>
-			<File
+				</FileConfiguration>
-				RelativePath="..\..\tools\assimp_view\Background.h"
+				<FileConfiguration
-				>
+					Name="Debug_DLL|Win32"
-			</File>
+					>
-			<File
+					<Tool
-				RelativePath="..\..\tools\assimp_view\Camera.h"
+						Name="VCCLCompilerTool"
-				>
+						UsePrecompiledHeader="1"
-			</File>
+					/>
-			<File
+				</FileConfiguration>
-				RelativePath="..\..\tools\assimp_view\Display.h"
+				<FileConfiguration
-				>
+					Name="Debug_DLL|x64"
-			</File>
+					>
-			<File
+					<Tool
-				RelativePath="..\..\tools\assimp_view\LogDisplay.h"
+						Name="VCCLCompilerTool"
-				>
+						UsePrecompiledHeader="1"
-			</File>
+					/>
-			<File
+				</FileConfiguration>
-				RelativePath="..\..\tools\assimp_view\LogWindow.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\assimp_view\MaterialManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\assimp_view\MeshRenderer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\assimp_view\RenderOptions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\assimp_view\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\assimp_view\Shaders.h"
-				>
 			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\stdafx.h"

workspaces/vc9/jAssimp.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="jAssimp"
+	Name="jAssimp_NOT_WORKING"
 	ProjectGUID="{FE78BFBA-4BA5-457D-8602-B800D498102D}"
 	RootNamespace="jAssimp"
 	Keyword="Win32Proj"
@@ -12,16 +12,19 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -41,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(JAVA_HOME)\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(SolutionDir)..\..\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JASSIMP_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,7 +65,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="assimp.lib"
+				OutputFile="$(OutDir)\jAssimp32d.dll"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -92,16 +98,94 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(SolutionDir)..\..\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JASSIMP_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="assimp.lib"
+				OutputFile="$(OutDir)\jAssimp64d.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="./../../bin/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
+			IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
+			ConfigurationType="2"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -117,7 +201,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include"
+				AdditionalIncludeDirectories="&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(SolutionDir)..\..\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JASSIMP_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -136,7 +220,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="assimp.lib"
+				OutputFile="$(OutDir)\jAssimp32.dll"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -167,6 +254,85 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(SolutionDir)..\..\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JASSIMP_EXPORTS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="assimp.lib"
+				OutputFile="$(OutDir)\jAssimp64.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -196,6 +362,10 @@
 				RelativePath="..\..\port\jAssimp\jni_bridge\JNIEnvironment.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\port\jAssimp\jni_bridge\JNIEnvironment.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\port\jAssimp\jni_bridge\JNIIOStream.cpp"
 				>
@@ -208,6 +378,10 @@
 				RelativePath="..\..\port\jAssimp\jni_bridge\JNILogger.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\port\jAssimp\jni_bridge\JNILogger.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\port\jAssimp\jni_bridge\JNIMaterial.cpp"
 				>
@@ -232,20 +406,6 @@
 				RelativePath="..\..\port\jAssimp\jni_bridge\JNITexture.cpp"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\port\jAssimp\jni_bridge\JNIEnvironment.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\jAssimp\jni_bridge\JNILogger.h"
-				>
-			</File>
 			<Filter
 				Name="javah"
 				>
@@ -253,26 +413,8 @@
 					RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Importer.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Importer_DefaultIOStream.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Importer_DefaultIOSystem.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Importer_Property.h"
-					>
-				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="resources"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>