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 @@ + + + + + + +