From d91f66108230b0195b237a3dcaf7e8d622fcca12 Mon Sep 17 00:00:00 2001 From: rave3d Date: Thu, 27 May 2010 18:28:02 +0000 Subject: [PATCH] commit new try of c# bindings git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@741 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- port/Assimp.NET/Assimp.NET.sln | 12 + port/Assimp.NET/Assimp.NET/Assimp.NET.vcproj | 15 +- port/Assimp.NET/Assimp.NET/AssimpSwigPort.i | 6 +- .../Assimp.NET_CS/Assimp.NET_CS.csproj | 37 +- port/Assimp.NET/Assimp.NET_CS/Assimp_NET.cs | 199 + .../Assimp.NET_CS/Assimp_NETPINVOKE.cs | 3513 +++++++++++++++++ port/Assimp.NET/Assimp.NET_CS/IOStream.cs | 72 + port/Assimp.NET/Assimp.NET_CS/IOSystem.cs | 75 + port/Assimp.NET/Assimp.NET_CS/Importer.cs | 229 ++ port/Assimp.NET/Assimp.NET_CS/LogStream.cs | 65 + port/Assimp.NET/Assimp.NET_CS/Logger.cs | 104 + port/Assimp.NET/Assimp.NET_CS/NullLogger.cs | 68 + .../SWIGTYPE_p_Assimp__BaseImporter.cs | 27 + .../SWIGTYPE_p_Assimp__BaseProcess.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_aiColor4D.cs | 27 + .../SWIGTYPE_p_aiTextureMapMode.cs | 27 + .../SWIGTYPE_p_aiTextureMapping.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_aiTextureOp.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_bool.cs | 27 + .../SWIGTYPE_p_f_p_aiFileIO_p_aiFile__void.cs | 27 + ...q_const__char_p_q_const__char__p_aiFile.cs | 27 + .../SWIGTYPE_p_f_p_aiFile__size_t.cs | 27 + .../SWIGTYPE_p_f_p_aiFile__void.cs | 27 + ...f_p_aiFile_p_char_size_t_size_t__size_t.cs | 27 + ...e_p_q_const__char_size_t_size_t__size_t.cs | 27 + ...p_aiFile_size_t_enum_aiOrigin__aiReturn.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_float.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_int.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiAnimMesh.cs | 27 + ...throw_t.cs => SWIGTYPE_p_p_aiAnimation.cs} | 8 +- .../Assimp.NET_CS/SWIGTYPE_p_p_aiBone.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiCamera.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiColor4D.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiLight.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiMaterial.cs | 27 + .../SWIGTYPE_p_p_aiMaterialProperty.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiMesh.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiMeshAnim.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiNode.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiNodeAnim.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiTexture.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_p_aiVector3D.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_std__string.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_unsigned_int.cs | 27 + .../Assimp.NET_CS/SWIGTYPE_p_void.cs | 27 + port/Assimp.NET/Assimp.NET_CS/UintVector.cs | 346 -- .../Assimp.NET_CS/aiAnimBehaviour.cs | 15 + port/Assimp.NET/Assimp.NET_CS/aiAnimMesh.cs | 137 + port/Assimp.NET/Assimp.NET_CS/aiAnimation.cs | 119 + .../Assimp.NET_CS/aiAnimationVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiBlendMode.cs | 13 + port/Assimp.NET/Assimp.NET_CS/aiBone.cs | 93 + port/Assimp.NET/Assimp.NET_CS/aiCamera.cs | 135 + .../Assimp.NET_CS/aiCameraVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiColor3D.cs | 131 + .../Assimp.NET_CS/aiColor4DVector.cs | 348 -- .../Assimp.NET_CS/aiColor4DVectorVector.cs | 327 -- port/Assimp.NET/Assimp.NET_CS/aiComponent.cs | 22 + .../Assimp.NET_CS/aiDefaultLogStream.cs | 16 + port/Assimp.NET/Assimp.NET_CS/aiFace.cs | 89 + port/Assimp.NET/Assimp.NET_CS/aiFaceVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiFile.cs | 122 + port/Assimp.NET/Assimp.NET_CS/aiFileIO.cs | 78 + port/Assimp.NET/Assimp.NET_CS/aiLight.cs | 172 + .../Assimp.NET_CS/aiLightSourceType.cs | 15 + .../Assimp.NET/Assimp.NET_CS/aiLightVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiMaterial.cs | 112 + .../Assimp.NET_CS/aiMaterialProperty.cs | 107 + .../Assimp.NET_CS/aiMaterialVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiMatrix3x3.cs | 212 + port/Assimp.NET/Assimp.NET_CS/aiMatrix4x4.cs | 326 ++ port/Assimp.NET/Assimp.NET_CS/aiMemoryInfo.cs | 126 + port/Assimp.NET/Assimp.NET_CS/aiMesh.cs | 272 ++ port/Assimp.NET/Assimp.NET_CS/aiMeshAnim.cs | 78 + port/Assimp.NET/Assimp.NET_CS/aiMeshKey.cs | 93 + port/Assimp.NET/Assimp.NET_CS/aiMeshVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiNode.cs | 138 + port/Assimp.NET/Assimp.NET_CS/aiNodeAnim.cs | 140 + .../Assimp.NET_CS/aiNodeAnimVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiNodeVector.cs | 348 -- port/Assimp.NET/Assimp.NET_CS/aiOrigin.cs | 15 + port/Assimp.NET/Assimp.NET_CS/aiPlane.cs | 93 + .../Assimp.NET_CS/aiPostProcessSteps.cs | 35 + .../Assimp.NET_CS/aiPrimitiveType.cs | 15 + .../Assimp.NET_CS/aiPropertyTypeInfo.cs | 15 + port/Assimp.NET/Assimp.NET_CS/aiQuatKey.cs | 95 + port/Assimp.NET/Assimp.NET_CS/aiQuaternion.cs | 148 + port/Assimp.NET/Assimp.NET_CS/aiRay.cs | 76 + port/Assimp.NET/Assimp.NET_CS/aiReturn.cs | 15 + port/Assimp.NET/Assimp.NET_CS/aiScene.cs | 223 ++ .../Assimp.NET/Assimp.NET_CS/aiShadingMode.cs | 21 + port/Assimp.NET/Assimp.NET_CS/aiString.cs | 104 + port/Assimp.NET/Assimp.NET_CS/aiTexel.cs | 98 + port/Assimp.NET/Assimp.NET_CS/aiTexture.cs | 92 + .../Assimp.NET_CS/aiTextureFlags.cs | 14 + .../Assimp.NET_CS/aiTextureMapMode.cs | 15 + .../Assimp.NET_CS/aiTextureMapping.cs | 17 + port/Assimp.NET/Assimp.NET_CS/aiTextureOp.cs | 17 + .../Assimp.NET/Assimp.NET_CS/aiTextureType.cs | 24 + .../Assimp.NET_CS/aiTextureVector.cs | 348 -- .../Assimp.NET/Assimp.NET_CS/aiUVTransform.cs | 78 + port/Assimp.NET/Assimp.NET_CS/aiVector2D.cs | 145 + port/Assimp.NET/Assimp.NET_CS/aiVector3D.cs | 162 + .../Assimp.NET_CS/aiVector3DVector.cs | 348 -- .../Assimp.NET_CS/aiVector3DVectorVector.cs | 327 -- port/Assimp.NET/Assimp.NET_CS/aiVectorKey.cs | 95 + .../Assimp.NET_CS/aiVertexWeight.cs | 69 + .../Assimp.NET_CS.csproj.FileListAbsolute.txt | 7 - .../Assimp.NET_CS/obj/Debug/Assimp.NET_CS.dll | Bin 189952 -> 0 bytes .../Assimp.NET_CS/obj/Debug/Assimp.NET_CS.pdb | Bin 417280 -> 0 bytes .../obj/Debug/ResolveAssemblyReference.cache | Bin 5077 -> 0 bytes .../Assimp.NET_DEMO/Assimp.NET_DEMO.csproj | 148 + .../Assimp.NET_DEMO.csproj.user | 18 + .../Assimp.NET_DEMO/Form1.Designer.cs | 49 + port/Assimp.NET/Assimp.NET_DEMO/Form1.cs | 64 + port/Assimp.NET/Assimp.NET_DEMO/Form1.resx | 120 + port/Assimp.NET/Assimp.NET_DEMO/Program.cs | 21 + .../Properties/AssemblyInfo.cs | 6 +- .../Properties/Resources.Designer.cs | 71 + .../Assimp.NET_DEMO/Properties/Resources.resx | 117 + .../Properties/Settings.Designer.cs | 30 + .../Properties/Settings.settings | 7 + 122 files changed, 10339 insertions(+), 4856 deletions(-) create mode 100644 port/Assimp.NET/Assimp.NET_CS/Assimp_NET.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/Assimp_NETPINVOKE.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/IOStream.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/IOSystem.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/Importer.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/LogStream.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/Logger.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/NullLogger.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_Assimp__BaseImporter.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_Assimp__BaseProcess.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiColor4D.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiTextureMapMode.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiTextureMapping.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiTextureOp.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_bool.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_f_p_aiFileIO_p_aiFile__void.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_f_p_aiFileIO_p_q_const__char_p_q_const__char__p_aiFile.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_f_p_aiFile__size_t.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_f_p_aiFile__void.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_f_p_aiFile_p_char_size_t_size_t__size_t.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_f_p_aiFile_p_q_const__char_size_t_size_t__size_t.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_f_p_aiFile_size_t_enum_aiOrigin__aiReturn.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_float.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_int.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiAnimMesh.cs rename port/Assimp.NET/Assimp.NET_CS/{SWIGTYPE_p_std__nothrow_t.cs => SWIGTYPE_p_p_aiAnimation.cs} (72%) create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiBone.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiCamera.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiColor4D.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiLight.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiMaterial.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiMaterialProperty.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiMesh.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiMeshAnim.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiNode.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiNodeAnim.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiTexture.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_p_aiVector3D.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_std__string.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_unsigned_int.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_void.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/UintVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiAnimBehaviour.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiAnimMesh.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiAnimation.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiAnimationVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiBlendMode.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiBone.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiCamera.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiCameraVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiColor3D.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiColor4DVector.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiColor4DVectorVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiComponent.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiDefaultLogStream.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiFace.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiFaceVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiFile.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiFileIO.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiLight.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiLightSourceType.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiLightVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMaterial.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMaterialProperty.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMaterialVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMatrix3x3.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMatrix4x4.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMemoryInfo.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMesh.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMeshAnim.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMeshKey.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiMeshVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiNode.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiNodeAnim.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiNodeAnimVector.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiNodeVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiOrigin.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiPlane.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiPostProcessSteps.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiPrimitiveType.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiPropertyTypeInfo.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiQuatKey.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiQuaternion.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiRay.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiReturn.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiScene.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiShadingMode.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiString.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTexel.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTexture.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTextureFlags.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTextureMapMode.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTextureMapping.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTextureOp.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTextureType.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiTextureVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiUVTransform.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiVector2D.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiVector3D.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiVector3DVector.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/aiVector3DVectorVector.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiVectorKey.cs create mode 100644 port/Assimp.NET/Assimp.NET_CS/aiVertexWeight.cs delete mode 100644 port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.csproj.FileListAbsolute.txt delete mode 100644 port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.dll delete mode 100644 port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.pdb delete mode 100644 port/Assimp.NET/Assimp.NET_CS/obj/Debug/ResolveAssemblyReference.cache create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Assimp.NET_DEMO.csproj create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Assimp.NET_DEMO.csproj.user create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Form1.Designer.cs create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Form1.cs create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Form1.resx create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Program.cs rename port/Assimp.NET/{Assimp.NET_CS => Assimp.NET_DEMO}/Properties/AssemblyInfo.cs (88%) create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.Designer.cs create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.resx create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.Designer.cs create mode 100644 port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.settings diff --git a/port/Assimp.NET/Assimp.NET.sln b/port/Assimp.NET/Assimp.NET.sln index 776877a7e..a50eefc9c 100644 --- a/port/Assimp.NET/Assimp.NET.sln +++ b/port/Assimp.NET/Assimp.NET.sln @@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assimp.NET_CS", "Assimp.NET {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} = {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assimp.NET_DEMO", "Assimp.NET_DEMO\Assimp.NET_DEMO.csproj", "{B2813591-1491-4C99-B6E2-67B484411AFC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -38,6 +40,16 @@ Global {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Win32.ActiveCfg = Release|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Debug|Win32.ActiveCfg = Debug|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Release|Any CPU.Build.0 = Release|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B2813591-1491-4C99-B6E2-67B484411AFC}.Release|Win32.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/port/Assimp.NET/Assimp.NET/Assimp.NET.vcproj b/port/Assimp.NET/Assimp.NET/Assimp.NET.vcproj index d0bcaba92..9f1713639 100644 --- a/port/Assimp.NET/Assimp.NET/Assimp.NET.vcproj +++ b/port/Assimp.NET/Assimp.NET/Assimp.NET.vcproj @@ -2,7 +2,7 @@ + + + {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} + Assimp_NET + + + + + + + + + + + + + + + @@ -85,21 +104,22 @@ + + + - - - + + - @@ -117,6 +137,7 @@ + @@ -124,20 +145,18 @@ + - + - - {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} - Assimp.NET - + + \ No newline at end of file diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Assimp.NET_DEMO.csproj.user b/port/Assimp.NET/Assimp.NET_DEMO/Assimp.NET_DEMO.csproj.user new file mode 100644 index 000000000..3b27fb449 --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Assimp.NET_DEMO.csproj.user @@ -0,0 +1,18 @@ + + + false + + + publish\ + + + + + + + + + de-DE + false + + \ No newline at end of file diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Form1.Designer.cs b/port/Assimp.NET/Assimp.NET_DEMO/Form1.Designer.cs new file mode 100644 index 000000000..0c45cdc42 --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Form1.Designer.cs @@ -0,0 +1,49 @@ +namespace Assimp.NET_DEMO +{ + partial class Form1 + { + /// + /// Erforderliche Designervariable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Verwendete Ressourcen bereinigen. + /// + /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Vom Windows Form-Designer generierter Code + + /// + /// Erforderliche Methode für die Designerunterstützung. + /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden. + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(735, 380); + this.Name = "Form1"; + this.Text = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + this.ResumeLayout(false); + + } + + #endregion + + } +} + diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Form1.cs b/port/Assimp.NET/Assimp.NET_DEMO/Form1.cs new file mode 100644 index 000000000..714ccc00b --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Form1.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using Microsoft.DirectX.Direct3D; + +namespace Assimp.NET_DEMO +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + + private void Form1_Load(object sender, EventArgs e) + { + InitializeDevice(); + InitializeAssimp(); + } + + public void InitializeDevice() + { + PresentParameters presentParams = new PresentParameters(); + presentParams.Windowed = true; + presentParams.SwapEffect = SwapEffect.Discard; + + device = new Device(0, DeviceType.Hardware, this, CreateFlags.SoftwareVertexProcessing, presentParams); + } + + public void InitializeAssimp() + { + + importer = new Importer(); + try + { + //aiScene human = importer.ReadFile_s("fff.obj", 0); + //importer.SetExtraVerbose(true); + String s = "fff.obj"; + importer.ReadFile(s, 0); + } + catch (Exception) + { + + throw; + } + + return; + } + + protected override void OnPaint(System.Windows.Forms.PaintEventArgs e) + { + device.Clear(ClearFlags.Target, Color.DarkSlateBlue, 1.0f, 0); + device.Present(); + } + + private Device device; + private Importer importer; + } +} diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Form1.resx b/port/Assimp.NET/Assimp.NET_DEMO/Form1.resx new file mode 100644 index 000000000..ff31a6db5 --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Program.cs b/port/Assimp.NET/Assimp.NET_DEMO/Program.cs new file mode 100644 index 000000000..5f7ac3cc7 --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Program.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; + +namespace Assimp.NET_DEMO +{ + static class Program + { + /// + /// Der Haupteinstiegspunkt für die Anwendung. + /// + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/port/Assimp.NET/Assimp.NET_CS/Properties/AssemblyInfo.cs b/port/Assimp.NET/Assimp.NET_DEMO/Properties/AssemblyInfo.cs similarity index 88% rename from port/Assimp.NET/Assimp.NET_CS/Properties/AssemblyInfo.cs rename to port/Assimp.NET/Assimp.NET_DEMO/Properties/AssemblyInfo.cs index a777dd625..eee3073b3 100644 --- a/port/Assimp.NET/Assimp.NET_CS/Properties/AssemblyInfo.cs +++ b/port/Assimp.NET/Assimp.NET_DEMO/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("Assimp.NET_CS")] +[assembly: AssemblyTitle("Assimp.NET_DEMO")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Assimp.NET_CS")] +[assembly: AssemblyProduct("Assimp.NET_DEMO")] [assembly: AssemblyCopyright("Copyright © Microsoft 2010")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("e49d1791-c198-4bbb-8dbe-c1e15aed4237")] +[assembly: Guid("bdbe5566-8c2f-4bef-9d1c-bcb9a916cf69")] // Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: // diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.Designer.cs b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.Designer.cs new file mode 100644 index 000000000..ca592a7ca --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:2.0.50727.4927 +// +// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn +// der Code neu generiert wird. +// +//------------------------------------------------------------------------------ + +namespace Assimp.NET_DEMO.Properties +{ + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse + // über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Assimp.NET_DEMO.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.resx b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.resx new file mode 100644 index 000000000..ffecec851 --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.Designer.cs b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.Designer.cs new file mode 100644 index 000000000..ef07933fc --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Assimp.NET_DEMO.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.settings b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.settings new file mode 100644 index 000000000..abf36c5d3 --- /dev/null +++ b/port/Assimp.NET/Assimp.NET_DEMO/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + +