From 634da6fe0b5a8fc033b6f26935fb1790692a6261 Mon Sep 17 00:00:00 2001 From: Harald Christian Joachim Wolff Date: Tue, 9 May 2017 23:41:50 +0200 Subject: [PATCH] nhengine -> budnhead --- NHEngine/{nhengine.csproj => bnhdemo.csproj} | 0 {NHEngine => bnhdemo}/BootStrap.cs | 10 +- {NHEngine => bnhdemo}/Graphics.cs | 2 +- {NHEngine => bnhdemo}/M3-wip.bmp | Bin {NHEngine => bnhdemo}/M3-wip.png | Bin {NHEngine => bnhdemo}/Notes.txt | 0 {NHEngine => bnhdemo}/OpenGLWindow.cs | 9 +- .../OpenGLWindow.cs~Stashed changes | 0 {NHEngine => bnhdemo}/OpenTK.dll.config | 0 .../Properties/AssemblyInfo.cs | 0 {NHEngine => bnhdemo}/TextureManager.cs | 2 +- bnhdemo/bnhdemo.csproj | 119 ++++++++++++ {NHEngine => bnhdemo}/models/alfa147.obj | 0 {NHEngine => bnhdemo}/models/ballistisch.mtl | 0 {NHEngine => bnhdemo}/models/ballistisch.obj | 0 {NHEngine => bnhdemo}/nhengine.sln | 0 {NHEngine => bnhdemo}/packages.config | 0 .../shader/simple_fragment.shader | 0 .../shader/simple_vertex.shader | 0 {NHEngine => bnhdemo}/sounds/HowFire.wav | Bin {NHEngine => bnhdemo}/sounds/HowHit.wav | Bin {NHEngine => bnhdemo}/sounds/seq01.wav | Bin {NHEngine => bnhdemo}/sounds/seq02.wav | Bin {NHEngine => bnhdemo}/sounds/seq03.wav | Bin {NHEngine => bnhdemo}/sounds/sfx1.wav | Bin {NHEngine => bnhdemo}/sounds/sfx2.wav | Bin {NHEngine => bnhdemo}/sounds/st1.wav | Bin {NHEngine => bnhdemo}/sounds/st2.wav | Bin nhengine.sln => budnhead.sln | 36 ++-- .../ArrayHelper.cs | 2 +- .../FileHelper.cs | 2 +- .../Gameplay Object Tree.txt | 0 .../Properties/AssemblyInfo.cs | 2 +- .../audio/AudioDelegate.cs | 6 +- .../audio/nhAux.cs | 2 +- .../audio/nhBuffers.cs | 4 +- .../audio/nhListener.cs | 2 +- .../audio/nhMixer.cs | 2 +- .../audio/nhPlayer.cs | 2 +- .../contrib/ImageSharp.dll | Bin .../core}/Actor.cs | 9 +- .../core}/ActorAction.cs | 2 +- .../core}/BallisticActor.cs | 7 +- .../core}/BallisticActorStates.cs | 2 +- .../core}/Geometry.cs | 4 +- .../core}/Linear.cs | 46 +++-- .../core}/Physics.cs | 2 +- .../core}/WorldObject.cs | 4 +- org.budnhead/exceptions/BudNHeadException.cs | 17 ++ .../exceptions/OutOfWorldException.cs | 7 + .../graphics/GLCamera.cs | 4 +- .../graphics/GLModel.cs | 4 +- .../graphics/GLObject.cs | 2 +- .../graphics/GLScene.cs | 3 +- .../graphics/GLSceneOrientation.cs | 2 +- .../graphics/GlobalDefaults.cs | 2 +- .../graphics/LoadedModel.cs | 2 +- .../graphics/Model3D.cs | 4 +- .../graphics/ModelManager.cs | 4 +- .../graphics/Shader.cs | 2 +- .../graphics/ShaderProgram.cs | 2 +- .../graphics/SquaredMap.cs | 5 +- .../graphics/Texture.cs | 2 +- .../graphics/primitives/Cube.cs | 3 +- .../graphics/primitives/Triangle.cs | 4 +- .../native/osx/openal-soft/include/AL/al.h | 0 .../native/osx/openal-soft/include/AL/alc.h | 0 .../native/osx/openal-soft/include/AL/alext.h | 0 .../osx/openal-soft/include/AL/efx-creative.h | 0 .../osx/openal-soft/include/AL/efx-presets.h | 0 .../native/osx/openal-soft/include/AL/efx.h | 0 .../OpenAL/OpenALConfig-relwithdebinfo.cmake | 0 .../lib/cmake/OpenAL/OpenALConfig.cmake | 0 .../openal-soft/lib/libopenal.1.17.2.dylib | Bin .../osx/openal-soft/lib/libopenal.1.dylib | 0 .../osx/openal-soft/lib/libopenal.dylib | 0 .../osx/openal-soft/lib/pkgconfig/openal.pc | 0 .../openal-soft/share/openal/alsoftrc.sample | 0 .../share/openal/hrtf/default-44100.mhr | Bin .../share/openal/hrtf/default-48000.mhr | Bin .../share/openal/presets/3D7.1.ambdec | 0 .../share/openal/presets/hexagon.ambdec | 0 .../share/openal/presets/itu5.1.ambdec | 0 .../share/openal/presets/presets.txt | 0 .../share/openal/presets/rectangle.ambdec | 0 .../share/openal/presets/square.ambdec | 0 org.budnhead/org.budnhead.csproj | 177 ++++++++++++++++++ .../packages.config | 0 .../exceptions/OutOfWorldException.cs | 10 - ...rald.engine.csproj => org.budnhead.csproj} | 0 90 files changed, 434 insertions(+), 100 deletions(-) rename NHEngine/{nhengine.csproj => bnhdemo.csproj} (100%) rename {NHEngine => bnhdemo}/BootStrap.cs (92%) rename {NHEngine => bnhdemo}/Graphics.cs (94%) rename {NHEngine => bnhdemo}/M3-wip.bmp (100%) rename {NHEngine => bnhdemo}/M3-wip.png (100%) rename {NHEngine => bnhdemo}/Notes.txt (100%) rename {NHEngine => bnhdemo}/OpenGLWindow.cs (97%) rename {NHEngine => bnhdemo}/OpenGLWindow.cs~Stashed changes (100%) rename {NHEngine => bnhdemo}/OpenTK.dll.config (100%) rename {NHEngine => bnhdemo}/Properties/AssemblyInfo.cs (100%) rename {NHEngine => bnhdemo}/TextureManager.cs (98%) create mode 100644 bnhdemo/bnhdemo.csproj rename {NHEngine => bnhdemo}/models/alfa147.obj (100%) rename {NHEngine => bnhdemo}/models/ballistisch.mtl (100%) rename {NHEngine => bnhdemo}/models/ballistisch.obj (100%) rename {NHEngine => bnhdemo}/nhengine.sln (100%) rename {NHEngine => bnhdemo}/packages.config (100%) rename {NHEngine => bnhdemo}/shader/simple_fragment.shader (100%) rename {NHEngine => bnhdemo}/shader/simple_vertex.shader (100%) rename {NHEngine => bnhdemo}/sounds/HowFire.wav (100%) rename {NHEngine => bnhdemo}/sounds/HowHit.wav (100%) rename {NHEngine => bnhdemo}/sounds/seq01.wav (100%) rename {NHEngine => bnhdemo}/sounds/seq02.wav (100%) rename {NHEngine => bnhdemo}/sounds/seq03.wav (100%) rename {NHEngine => bnhdemo}/sounds/sfx1.wav (100%) rename {NHEngine => bnhdemo}/sounds/sfx2.wav (100%) rename {NHEngine => bnhdemo}/sounds/st1.wav (100%) rename {NHEngine => bnhdemo}/sounds/st2.wav (100%) rename nhengine.sln => budnhead.sln (83%) rename {org.niclasundharald.engine => org.budnhead}/ArrayHelper.cs (82%) rename {org.niclasundharald.engine => org.budnhead}/FileHelper.cs (92%) rename {org.niclasundharald.engine => org.budnhead}/Gameplay Object Tree.txt (100%) rename {org.niclasundharald.engine => org.budnhead}/Properties/AssemblyInfo.cs (94%) rename {org.niclasundharald.engine => org.budnhead}/audio/AudioDelegate.cs (93%) rename {org.niclasundharald.engine => org.budnhead}/audio/nhAux.cs (83%) rename {org.niclasundharald.engine => org.budnhead}/audio/nhBuffers.cs (98%) rename {org.niclasundharald.engine => org.budnhead}/audio/nhListener.cs (97%) rename {org.niclasundharald.engine => org.budnhead}/audio/nhMixer.cs (89%) rename {org.niclasundharald.engine => org.budnhead}/audio/nhPlayer.cs (99%) rename {org.niclasundharald.engine => org.budnhead}/contrib/ImageSharp.dll (100%) rename {org.niclasundharald.engine => org.budnhead/core}/Actor.cs (95%) rename {org.niclasundharald.engine => org.budnhead/core}/ActorAction.cs (86%) rename {org.niclasundharald.engine => org.budnhead/core}/BallisticActor.cs (92%) rename {org.niclasundharald.engine => org.budnhead/core}/BallisticActorStates.cs (71%) rename {org.niclasundharald.engine => org.budnhead/core}/Geometry.cs (96%) rename {org.niclasundharald.engine => org.budnhead/core}/Linear.cs (59%) rename {org.niclasundharald.engine => org.budnhead/core}/Physics.cs (80%) rename {org.niclasundharald.engine => org.budnhead/core}/WorldObject.cs (93%) create mode 100644 org.budnhead/exceptions/BudNHeadException.cs create mode 100644 org.budnhead/exceptions/OutOfWorldException.cs rename {org.niclasundharald.engine => org.budnhead}/graphics/GLCamera.cs (97%) rename {org.niclasundharald.engine => org.budnhead}/graphics/GLModel.cs (84%) rename {org.niclasundharald.engine => org.budnhead}/graphics/GLObject.cs (99%) rename {org.niclasundharald.engine => org.budnhead}/graphics/GLScene.cs (95%) rename {org.niclasundharald.engine => org.budnhead}/graphics/GLSceneOrientation.cs (91%) rename {org.niclasundharald.engine => org.budnhead}/graphics/GlobalDefaults.cs (98%) rename {org.niclasundharald.engine => org.budnhead}/graphics/LoadedModel.cs (98%) rename {org.niclasundharald.engine => org.budnhead}/graphics/Model3D.cs (98%) rename {org.niclasundharald.engine => org.budnhead}/graphics/ModelManager.cs (94%) rename {org.niclasundharald.engine => org.budnhead}/graphics/Shader.cs (96%) rename {org.niclasundharald.engine => org.budnhead}/graphics/ShaderProgram.cs (98%) rename {org.niclasundharald.engine => org.budnhead}/graphics/SquaredMap.cs (98%) rename {org.niclasundharald.engine => org.budnhead}/graphics/Texture.cs (89%) rename {org.niclasundharald.engine => org.budnhead}/graphics/primitives/Cube.cs (96%) rename {org.niclasundharald.engine => org.budnhead}/graphics/primitives/Triangle.cs (71%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/include/AL/al.h (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/include/AL/alc.h (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/include/AL/alext.h (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/include/AL/efx-creative.h (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/include/AL/efx-presets.h (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/include/AL/efx.h (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig-relwithdebinfo.cmake (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig.cmake (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/lib/libopenal.1.17.2.dylib (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/lib/libopenal.1.dylib (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/lib/libopenal.dylib (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/lib/pkgconfig/openal.pc (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/alsoftrc.sample (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/hrtf/default-44100.mhr (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/hrtf/default-48000.mhr (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/presets/3D7.1.ambdec (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/presets/hexagon.ambdec (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/presets/itu5.1.ambdec (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/presets/presets.txt (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/presets/rectangle.ambdec (100%) rename {org.niclasundharald.engine => org.budnhead}/native/osx/openal-soft/share/openal/presets/square.ambdec (100%) create mode 100644 org.budnhead/org.budnhead.csproj rename {org.niclasundharald.engine => org.budnhead}/packages.config (100%) delete mode 100644 org.niclasundharald.engine/exceptions/OutOfWorldException.cs rename org.niclasundharald.engine/{org.niclasundharald.engine.csproj => org.budnhead.csproj} (100%) diff --git a/NHEngine/nhengine.csproj b/NHEngine/bnhdemo.csproj similarity index 100% rename from NHEngine/nhengine.csproj rename to NHEngine/bnhdemo.csproj diff --git a/NHEngine/BootStrap.cs b/bnhdemo/BootStrap.cs similarity index 92% rename from NHEngine/BootStrap.cs rename to bnhdemo/BootStrap.cs index c53763b..376a595 100644 --- a/NHEngine/BootStrap.cs +++ b/bnhdemo/BootStrap.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Drawing; using System.Drawing.Imaging; @@ -8,15 +8,15 @@ using OpenTK; using OpenTK.Audio.OpenAL; using OpenTK.Audio; -using nhengine.Audio; using ImageSharp; using ImageSharp.Processing; -using org.niclasundharald.engine.graphics; -using org.niclasundharald.engine; +using org.budnhead.graphics; +using org.budnhead.audio; +using org.budnhead.core; -namespace nhengine +namespace bnhdemo { public class BootStrap { diff --git a/NHEngine/Graphics.cs b/bnhdemo/Graphics.cs similarity index 94% rename from NHEngine/Graphics.cs rename to bnhdemo/Graphics.cs index 72f1997..bd0c21c 100644 --- a/NHEngine/Graphics.cs +++ b/bnhdemo/Graphics.cs @@ -4,7 +4,7 @@ using System.IO; using OpenTK.Graphics.OpenGL; using OpenTK; -namespace nhengine +namespace bnhdemo { public class Graphics { diff --git a/NHEngine/M3-wip.bmp b/bnhdemo/M3-wip.bmp similarity index 100% rename from NHEngine/M3-wip.bmp rename to bnhdemo/M3-wip.bmp diff --git a/NHEngine/M3-wip.png b/bnhdemo/M3-wip.png similarity index 100% rename from NHEngine/M3-wip.png rename to bnhdemo/M3-wip.png diff --git a/NHEngine/Notes.txt b/bnhdemo/Notes.txt similarity index 100% rename from NHEngine/Notes.txt rename to bnhdemo/Notes.txt diff --git a/NHEngine/OpenGLWindow.cs b/bnhdemo/OpenGLWindow.cs similarity index 97% rename from NHEngine/OpenGLWindow.cs rename to bnhdemo/OpenGLWindow.cs index 9067073..ddab7dc 100644 --- a/NHEngine/OpenGLWindow.cs +++ b/bnhdemo/OpenGLWindow.cs @@ -6,11 +6,12 @@ using OpenTK.Graphics; using OpenTK.Graphics.OpenGL; using OpenTK; -using org.niclasundharald.engine; -using org.niclasundharald.engine.graphics; -using org.niclasundharald.engine.graphics.primitives; +using org.budnhead.core; +using org.budnhead.exceptions; +using org.budnhead.graphics; +using org.budnhead.graphics.primitives; -namespace nhengine +namespace bnhdemo { public class OpenGLWindow : GameWindow diff --git a/NHEngine/OpenGLWindow.cs~Stashed changes b/bnhdemo/OpenGLWindow.cs~Stashed changes similarity index 100% rename from NHEngine/OpenGLWindow.cs~Stashed changes rename to bnhdemo/OpenGLWindow.cs~Stashed changes diff --git a/NHEngine/OpenTK.dll.config b/bnhdemo/OpenTK.dll.config similarity index 100% rename from NHEngine/OpenTK.dll.config rename to bnhdemo/OpenTK.dll.config diff --git a/NHEngine/Properties/AssemblyInfo.cs b/bnhdemo/Properties/AssemblyInfo.cs similarity index 100% rename from NHEngine/Properties/AssemblyInfo.cs rename to bnhdemo/Properties/AssemblyInfo.cs diff --git a/NHEngine/TextureManager.cs b/bnhdemo/TextureManager.cs similarity index 98% rename from NHEngine/TextureManager.cs rename to bnhdemo/TextureManager.cs index e6c6cb9..533d7db 100644 --- a/NHEngine/TextureManager.cs +++ b/bnhdemo/TextureManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using OpenTK.Graphics.OpenGL4; -namespace nhengine +namespace bnhdemo { public class TextureManager { diff --git a/bnhdemo/bnhdemo.csproj b/bnhdemo/bnhdemo.csproj new file mode 100644 index 0000000..629e5ad --- /dev/null +++ b/bnhdemo/bnhdemo.csproj @@ -0,0 +1,119 @@ + + + + Debug + AnyCPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21} + WinExe + nhengine + nhengine + v4.5 + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + true + anycpu + + + true + bin\Release + prompt + 4 + false + true + + + + + ..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll + + + + + ..\packages\System.Numerics.Vectors.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Numerics.Vectors.dll + + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + + + + + + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + + + ..\org.budnhead\contrib\ImageSharp.dll + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + PreserveNewest + + + + + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + + + {56733EC1-7D97-48D0-AA4C-98EA624A5A21} + org.hwo.contracts + + + {3E812F66-D5F3-4599-8360-97F355B6CC1B} + org.budnhead + + + + + + + diff --git a/NHEngine/models/alfa147.obj b/bnhdemo/models/alfa147.obj similarity index 100% rename from NHEngine/models/alfa147.obj rename to bnhdemo/models/alfa147.obj diff --git a/NHEngine/models/ballistisch.mtl b/bnhdemo/models/ballistisch.mtl similarity index 100% rename from NHEngine/models/ballistisch.mtl rename to bnhdemo/models/ballistisch.mtl diff --git a/NHEngine/models/ballistisch.obj b/bnhdemo/models/ballistisch.obj similarity index 100% rename from NHEngine/models/ballistisch.obj rename to bnhdemo/models/ballistisch.obj diff --git a/NHEngine/nhengine.sln b/bnhdemo/nhengine.sln similarity index 100% rename from NHEngine/nhengine.sln rename to bnhdemo/nhengine.sln diff --git a/NHEngine/packages.config b/bnhdemo/packages.config similarity index 100% rename from NHEngine/packages.config rename to bnhdemo/packages.config diff --git a/NHEngine/shader/simple_fragment.shader b/bnhdemo/shader/simple_fragment.shader similarity index 100% rename from NHEngine/shader/simple_fragment.shader rename to bnhdemo/shader/simple_fragment.shader diff --git a/NHEngine/shader/simple_vertex.shader b/bnhdemo/shader/simple_vertex.shader similarity index 100% rename from NHEngine/shader/simple_vertex.shader rename to bnhdemo/shader/simple_vertex.shader diff --git a/NHEngine/sounds/HowFire.wav b/bnhdemo/sounds/HowFire.wav similarity index 100% rename from NHEngine/sounds/HowFire.wav rename to bnhdemo/sounds/HowFire.wav diff --git a/NHEngine/sounds/HowHit.wav b/bnhdemo/sounds/HowHit.wav similarity index 100% rename from NHEngine/sounds/HowHit.wav rename to bnhdemo/sounds/HowHit.wav diff --git a/NHEngine/sounds/seq01.wav b/bnhdemo/sounds/seq01.wav similarity index 100% rename from NHEngine/sounds/seq01.wav rename to bnhdemo/sounds/seq01.wav diff --git a/NHEngine/sounds/seq02.wav b/bnhdemo/sounds/seq02.wav similarity index 100% rename from NHEngine/sounds/seq02.wav rename to bnhdemo/sounds/seq02.wav diff --git a/NHEngine/sounds/seq03.wav b/bnhdemo/sounds/seq03.wav similarity index 100% rename from NHEngine/sounds/seq03.wav rename to bnhdemo/sounds/seq03.wav diff --git a/NHEngine/sounds/sfx1.wav b/bnhdemo/sounds/sfx1.wav similarity index 100% rename from NHEngine/sounds/sfx1.wav rename to bnhdemo/sounds/sfx1.wav diff --git a/NHEngine/sounds/sfx2.wav b/bnhdemo/sounds/sfx2.wav similarity index 100% rename from NHEngine/sounds/sfx2.wav rename to bnhdemo/sounds/sfx2.wav diff --git a/NHEngine/sounds/st1.wav b/bnhdemo/sounds/st1.wav similarity index 100% rename from NHEngine/sounds/st1.wav rename to bnhdemo/sounds/st1.wav diff --git a/NHEngine/sounds/st2.wav b/bnhdemo/sounds/st2.wav similarity index 100% rename from NHEngine/sounds/st2.wav rename to bnhdemo/sounds/st2.wav diff --git a/nhengine.sln b/budnhead.sln similarity index 83% rename from nhengine.sln rename to budnhead.sln index 06aa840..3368013 100644 --- a/nhengine.sln +++ b/budnhead.sln @@ -1,16 +1,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nhengine", "NHEngine\nhengine.csproj", "{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.niclasundharald.engine", "org.niclasundharald.engine\org.niclasundharald.engine.csproj", "{3E812F66-D5F3-4599-8360-97F355B6CC1B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.hwo.contracts", "org.hwo.contracts\org.hwo.contracts.csproj", "{56733EC1-7D97-48D0-AA4C-98EA624A5A21}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "opentk\src\OpenTK\OpenTK.csproj", "{A37A7E14-0000-0000-0000-000000000000}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Rewrite", "opentk\src\Generator.Rewrite\Generator.Rewrite.csproj", "{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bnhdemo", "bnhdemo\bnhdemo.csproj", "{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.budnhead", "org.budnhead\org.budnhead.csproj", "{3E812F66-D5F3-4599-8360-97F355B6CC1B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -19,18 +19,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|Any CPU.Build.0 = Release|Any CPU - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|x86.ActiveCfg = Debug|Any CPU - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|x86.Build.0 = Debug|Any CPU - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|x86.ActiveCfg = Release|Any CPU - {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|x86.Build.0 = Release|Any CPU - {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|Any CPU.Build.0 = Release|Any CPU {4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -47,6 +35,22 @@ Global {C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Release|Any CPU.ActiveCfg = Release|Any CPU {C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Release|Any CPU.Build.0 = Release|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|Any CPU.Build.0 = Release|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|x86.ActiveCfg = Debug|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Debug|x86.Build.0 = Debug|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|x86.ActiveCfg = Release|Any CPU + {42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}.Release|x86.Build.0 = Release|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|Any CPU.Build.0 = Release|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|x86.ActiveCfg = Debug|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Debug|x86.Build.0 = Debug|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|x86.ActiveCfg = Release|Any CPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {4D1A7C04-2C4E-4C74-AD81-FE0DCA9C6DF0} = {9BA2E63F-E39C-465C-AC48-45B30B532A0C} diff --git a/org.niclasundharald.engine/ArrayHelper.cs b/org.budnhead/ArrayHelper.cs similarity index 82% rename from org.niclasundharald.engine/ArrayHelper.cs rename to org.budnhead/ArrayHelper.cs index 98fedff..891d9f5 100644 --- a/org.niclasundharald.engine/ArrayHelper.cs +++ b/org.budnhead/ArrayHelper.cs @@ -1,7 +1,7 @@ using System; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public static class ArrayHelper { diff --git a/org.niclasundharald.engine/FileHelper.cs b/org.budnhead/FileHelper.cs similarity index 92% rename from org.niclasundharald.engine/FileHelper.cs rename to org.budnhead/FileHelper.cs index c7d31db..2b99f7a 100644 --- a/org.niclasundharald.engine/FileHelper.cs +++ b/org.budnhead/FileHelper.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public static class FileHelper { diff --git a/org.niclasundharald.engine/Gameplay Object Tree.txt b/org.budnhead/Gameplay Object Tree.txt similarity index 100% rename from org.niclasundharald.engine/Gameplay Object Tree.txt rename to org.budnhead/Gameplay Object Tree.txt diff --git a/org.niclasundharald.engine/Properties/AssemblyInfo.cs b/org.budnhead/Properties/AssemblyInfo.cs similarity index 94% rename from org.niclasundharald.engine/Properties/AssemblyInfo.cs rename to org.budnhead/Properties/AssemblyInfo.cs index 4d99be0..b1bb6aa 100644 --- a/org.niclasundharald.engine/Properties/AssemblyInfo.cs +++ b/org.budnhead/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("org.niclasundharald.engine")] +[assembly: AssemblyTitle("org.budnhead.core")] [assembly: AssemblyDescription("Gaming Engine created by Niclas and Harald")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Niclas&Harald")] diff --git a/org.niclasundharald.engine/audio/AudioDelegate.cs b/org.budnhead/audio/AudioDelegate.cs similarity index 93% rename from org.niclasundharald.engine/audio/AudioDelegate.cs rename to org.budnhead/audio/AudioDelegate.cs index 8776a8a..6f22ab1 100644 --- a/org.niclasundharald.engine/audio/AudioDelegate.cs +++ b/org.budnhead/audio/AudioDelegate.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Threading; using OpenTK.Audio; @@ -9,7 +9,7 @@ using OpenTK; -namespace nhengine.Audio +namespace org.budnhead.audio { @@ -29,7 +29,7 @@ namespace nhengine.Audio nhBuffers.init(); DistanceModel(); //nhAux reverb = new nhAux(); - Console.WriteLine("nhengine.Audio initialized."); + Console.WriteLine("org.budnhead.audio initialized."); } diff --git a/org.niclasundharald.engine/audio/nhAux.cs b/org.budnhead/audio/nhAux.cs similarity index 83% rename from org.niclasundharald.engine/audio/nhAux.cs rename to org.budnhead/audio/nhAux.cs index b427a31..d01cb2c 100644 --- a/org.niclasundharald.engine/audio/nhAux.cs +++ b/org.budnhead/audio/nhAux.cs @@ -5,7 +5,7 @@ using OpenTK.Audio.OpenAL; -namespace nhengine.Audio +namespace org.budnhead.audio { public class nhAux { diff --git a/org.niclasundharald.engine/audio/nhBuffers.cs b/org.budnhead/audio/nhBuffers.cs similarity index 98% rename from org.niclasundharald.engine/audio/nhBuffers.cs rename to org.budnhead/audio/nhBuffers.cs index 830f24c..9d36fa5 100644 --- a/org.niclasundharald.engine/audio/nhBuffers.cs +++ b/org.budnhead/audio/nhBuffers.cs @@ -3,12 +3,12 @@ using System.IO; using System.Collections.Generic; using OpenTK.Audio; using OpenTK.Audio.OpenAL; -using org.niclasundharald.engine; +using org.budnhead.core; -namespace nhengine.Audio +namespace org.budnhead.audio { diff --git a/org.niclasundharald.engine/audio/nhListener.cs b/org.budnhead/audio/nhListener.cs similarity index 97% rename from org.niclasundharald.engine/audio/nhListener.cs rename to org.budnhead/audio/nhListener.cs index 5a567c5..3fb63db 100644 --- a/org.niclasundharald.engine/audio/nhListener.cs +++ b/org.budnhead/audio/nhListener.cs @@ -4,7 +4,7 @@ using OpenTK.Audio; using OpenTK.Audio.OpenAL; -namespace nhengine.Audio +namespace org.budnhead.audio { public static class nhListener diff --git a/org.niclasundharald.engine/audio/nhMixer.cs b/org.budnhead/audio/nhMixer.cs similarity index 89% rename from org.niclasundharald.engine/audio/nhMixer.cs rename to org.budnhead/audio/nhMixer.cs index 6ae8f28..7338092 100644 --- a/org.niclasundharald.engine/audio/nhMixer.cs +++ b/org.budnhead/audio/nhMixer.cs @@ -7,7 +7,7 @@ using OpenTK.Audio.OpenAL; using System.Windows.Forms; -namespace nhengine.Audio +namespace org.budnhead.audio { public static class nhMixer { diff --git a/org.niclasundharald.engine/audio/nhPlayer.cs b/org.budnhead/audio/nhPlayer.cs similarity index 99% rename from org.niclasundharald.engine/audio/nhPlayer.cs rename to org.budnhead/audio/nhPlayer.cs index 030c4dc..2d5b7d7 100644 --- a/org.niclasundharald.engine/audio/nhPlayer.cs +++ b/org.budnhead/audio/nhPlayer.cs @@ -7,7 +7,7 @@ using OpenTK.Audio.OpenAL; -namespace nhengine.Audio +namespace org.budnhead.audio { public class nhPlayer { diff --git a/org.niclasundharald.engine/contrib/ImageSharp.dll b/org.budnhead/contrib/ImageSharp.dll similarity index 100% rename from org.niclasundharald.engine/contrib/ImageSharp.dll rename to org.budnhead/contrib/ImageSharp.dll diff --git a/org.niclasundharald.engine/Actor.cs b/org.budnhead/core/Actor.cs similarity index 95% rename from org.niclasundharald.engine/Actor.cs rename to org.budnhead/core/Actor.cs index 9ab1949..1c05c48 100644 --- a/org.niclasundharald.engine/Actor.cs +++ b/org.budnhead/core/Actor.cs @@ -1,13 +1,12 @@ -using System; +using System; using System.Collections.Generic; using OpenTK; -using org.niclasundharald.engine.graphics; +using org.budnhead.audio; -using nhengine.Audio; +using org.budnhead.graphics; - -namespace org.niclasundharald.engine +namespace org.budnhead.core { public class Actor : WorldObject { diff --git a/org.niclasundharald.engine/ActorAction.cs b/org.budnhead/core/ActorAction.cs similarity index 86% rename from org.niclasundharald.engine/ActorAction.cs rename to org.budnhead/core/ActorAction.cs index abc36b7..caa4cb5 100644 --- a/org.niclasundharald.engine/ActorAction.cs +++ b/org.budnhead/core/ActorAction.cs @@ -1,5 +1,5 @@ using System; -namespace org.niclasundharald.engine +namespace org.budnhead.core { /** * @class ActorAction diff --git a/org.niclasundharald.engine/BallisticActor.cs b/org.budnhead/core/BallisticActor.cs similarity index 92% rename from org.niclasundharald.engine/BallisticActor.cs rename to org.budnhead/core/BallisticActor.cs index 7f05456..23437f8 100644 --- a/org.niclasundharald.engine/BallisticActor.cs +++ b/org.budnhead/core/BallisticActor.cs @@ -1,12 +1,13 @@ using System; -using org.niclasundharald.engine.graphics.primitives; -using org.niclasundharald.engine.graphics; +using org.budnhead.graphics.primitives; +using org.budnhead.graphics; +using org.budnhead.exceptions; using OpenTK; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public class BallisticActor : Actor { diff --git a/org.niclasundharald.engine/BallisticActorStates.cs b/org.budnhead/core/BallisticActorStates.cs similarity index 71% rename from org.niclasundharald.engine/BallisticActorStates.cs rename to org.budnhead/core/BallisticActorStates.cs index 1ea56fc..cd7c0a9 100644 --- a/org.niclasundharald.engine/BallisticActorStates.cs +++ b/org.budnhead/core/BallisticActorStates.cs @@ -1,5 +1,5 @@ using System; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public enum BallisticActorStates { diff --git a/org.niclasundharald.engine/Geometry.cs b/org.budnhead/core/Geometry.cs similarity index 96% rename from org.niclasundharald.engine/Geometry.cs rename to org.budnhead/core/Geometry.cs index b1cec39..4defd82 100644 --- a/org.niclasundharald.engine/Geometry.cs +++ b/org.budnhead/core/Geometry.cs @@ -3,7 +3,7 @@ using org.hwo.contracts; using OpenTK; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public static class Geometry { @@ -83,6 +83,8 @@ namespace org.niclasundharald.engine Vector3 coeff = new Vector3(); p = new Vector3(); + Console.WriteLine("Check triangle intersection for {0} {1} {2}",A,B,C); + return new BooleanConditional() .requires(intersectPlainCoeff(P,V,A,B,C,out coeff)) .requires(coeff.Y >= 0) diff --git a/org.niclasundharald.engine/Linear.cs b/org.budnhead/core/Linear.cs similarity index 59% rename from org.niclasundharald.engine/Linear.cs rename to org.budnhead/core/Linear.cs index e044587..9515e7a 100644 --- a/org.niclasundharald.engine/Linear.cs +++ b/org.budnhead/core/Linear.cs @@ -1,7 +1,7 @@ using System; using OpenTK; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public static class Linear { @@ -13,12 +13,8 @@ namespace org.niclasundharald.engine rows[2] = new Vector4(X.Z,Y.Z,Z.Z,W.Z); c = new Vector3(); - /* - Console.WriteLine("Solver Unsolved:"); - Console.WriteLine("X: {0}",rows[0]); - Console.WriteLine("Y: {0}",rows[1]); - Console.WriteLine("Z: {0}",rows[2]); -*/ + Console.WriteLine("New Linear Equation System to solve:"); + dumpLinearSystem(rows); if (rows[0].Z == 0){ Vector4 t = rows[0]; @@ -38,6 +34,8 @@ namespace org.niclasundharald.engine rows[2] -= rows[0] * (rows[2].Z / rows[0].Z); } + dumpLinearSystem(rows); + if (rows[1].Y == 0){ Vector4 t = rows[1]; rows[1] = rows[2]; @@ -50,19 +48,33 @@ namespace org.niclasundharald.engine rows[2] -= rows[1] * (rows[2].Y / rows[1].Y); } + dumpLinearSystem(rows); + rows[2] /= rows[2].X; - c.X = rows[2].W; - c.Y = (rows[1].W - (rows[1].X * c.X)) / rows[1].Y; - c.Z = (rows[0].W - (rows[0].X * c.X) - (rows[0].Y * c.Y)) / rows[0].Z; - /* - Console.WriteLine("Solver Solved:"); - Console.WriteLine("X: {0}",rows[0]); - Console.WriteLine("Y: {0}",rows[1]); - Console.WriteLine("Z: {0}",rows[2]); - Console.WriteLine("P: {0}",c); - */ + + rows[1].W -= rows[1].X * c.X; + rows[1].X = 0; + rows[1] /= rows[1].Y; + c.Y = rows[1].W; + + rows[0].W -= rows[0].X * c.X; + rows[0].X = 0; + rows[0].W -= rows[0].Y * c.Y; + rows[0].Y = 0; + rows[0] /= rows[0].Z; + c.Z = rows[0].W; + + dumpLinearSystem(rows); + Console.WriteLine("Solved to {0}",c); return true; } + + static void dumpLinearSystem(Vector4[] rows){ + Console.WriteLine("Linear Equation System Dump:"); + foreach (Vector4 v4 in rows){ + Console.WriteLine(" {0}",v4); + } + } } } diff --git a/org.niclasundharald.engine/Physics.cs b/org.budnhead/core/Physics.cs similarity index 80% rename from org.niclasundharald.engine/Physics.cs rename to org.budnhead/core/Physics.cs index 2a438e7..9f48141 100644 --- a/org.niclasundharald.engine/Physics.cs +++ b/org.budnhead/core/Physics.cs @@ -2,7 +2,7 @@ using OpenTK; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public abstract class Physics { diff --git a/org.niclasundharald.engine/WorldObject.cs b/org.budnhead/core/WorldObject.cs similarity index 93% rename from org.niclasundharald.engine/WorldObject.cs rename to org.budnhead/core/WorldObject.cs index d5e4c7d..e709f0f 100644 --- a/org.niclasundharald.engine/WorldObject.cs +++ b/org.budnhead/core/WorldObject.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using OpenTK; -using org.niclasundharald.engine.graphics; +using org.budnhead.graphics; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public abstract class WorldObject { diff --git a/org.budnhead/exceptions/BudNHeadException.cs b/org.budnhead/exceptions/BudNHeadException.cs new file mode 100644 index 0000000..57e9390 --- /dev/null +++ b/org.budnhead/exceptions/BudNHeadException.cs @@ -0,0 +1,17 @@ +using System; +namespace org.budnhead +{ + public class BudNHeadException : Exception + { + public BudNHeadException(){ + } + + public BudNHeadException(string msg){ + } + + public BudNHeadException(string msg,Exception causedBy){ + } + + + } +} diff --git a/org.budnhead/exceptions/OutOfWorldException.cs b/org.budnhead/exceptions/OutOfWorldException.cs new file mode 100644 index 0000000..c8d1a50 --- /dev/null +++ b/org.budnhead/exceptions/OutOfWorldException.cs @@ -0,0 +1,7 @@ +using System; + +namespace org.budnhead.exceptions +{ + public class OutOfWorldException : BudNHeadException{ + } +} diff --git a/org.niclasundharald.engine/graphics/GLCamera.cs b/org.budnhead/graphics/GLCamera.cs similarity index 97% rename from org.niclasundharald.engine/graphics/GLCamera.cs rename to org.budnhead/graphics/GLCamera.cs index a855f71..42a1169 100644 --- a/org.niclasundharald.engine/graphics/GLCamera.cs +++ b/org.budnhead/graphics/GLCamera.cs @@ -3,9 +3,9 @@ using OpenTK.Graphics.OpenGL; using OpenTK.Graphics; using OpenTK; -using nhengine.Audio; +using org.budnhead.audio; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class GLCamera : GLSceneOrientation { diff --git a/org.niclasundharald.engine/graphics/GLModel.cs b/org.budnhead/graphics/GLModel.cs similarity index 84% rename from org.niclasundharald.engine/graphics/GLModel.cs rename to org.budnhead/graphics/GLModel.cs index 270d0ce..19b1fd2 100644 --- a/org.niclasundharald.engine/graphics/GLModel.cs +++ b/org.budnhead/graphics/GLModel.cs @@ -1,9 +1,9 @@ using System; using System.IO; -using org.niclasundharald.engine.graphics; +using org.budnhead.graphics; -namespace org.niclasundharald.engine +namespace org.budnhead.graphics { public class GLModel : GLObject { diff --git a/org.niclasundharald.engine/graphics/GLObject.cs b/org.budnhead/graphics/GLObject.cs similarity index 99% rename from org.niclasundharald.engine/graphics/GLObject.cs rename to org.budnhead/graphics/GLObject.cs index 055d895..3c5146d 100644 --- a/org.niclasundharald.engine/graphics/GLObject.cs +++ b/org.budnhead/graphics/GLObject.cs @@ -5,7 +5,7 @@ using OpenTK.Graphics; using OpenTK; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class GLObject { diff --git a/org.niclasundharald.engine/graphics/GLScene.cs b/org.budnhead/graphics/GLScene.cs similarity index 95% rename from org.niclasundharald.engine/graphics/GLScene.cs rename to org.budnhead/graphics/GLScene.cs index 2195929..b8777bf 100644 --- a/org.niclasundharald.engine/graphics/GLScene.cs +++ b/org.budnhead/graphics/GLScene.cs @@ -1,8 +1,9 @@ using System; using OpenTK; +using org.budnhead.core; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class GLScene { diff --git a/org.niclasundharald.engine/graphics/GLSceneOrientation.cs b/org.budnhead/graphics/GLSceneOrientation.cs similarity index 91% rename from org.niclasundharald.engine/graphics/GLSceneOrientation.cs rename to org.budnhead/graphics/GLSceneOrientation.cs index 684a6f1..4d4260a 100644 --- a/org.niclasundharald.engine/graphics/GLSceneOrientation.cs +++ b/org.budnhead/graphics/GLSceneOrientation.cs @@ -3,7 +3,7 @@ using OpenTK; using OpenTK.Graphics.OpenGL; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class GLSceneOrientation { diff --git a/org.niclasundharald.engine/graphics/GlobalDefaults.cs b/org.budnhead/graphics/GlobalDefaults.cs similarity index 98% rename from org.niclasundharald.engine/graphics/GlobalDefaults.cs rename to org.budnhead/graphics/GlobalDefaults.cs index 8342630..0034c2b 100644 --- a/org.niclasundharald.engine/graphics/GlobalDefaults.cs +++ b/org.budnhead/graphics/GlobalDefaults.cs @@ -2,7 +2,7 @@ using OpenTK.Graphics.OpenGL; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class GlobalDefaults { diff --git a/org.niclasundharald.engine/graphics/LoadedModel.cs b/org.budnhead/graphics/LoadedModel.cs similarity index 98% rename from org.niclasundharald.engine/graphics/LoadedModel.cs rename to org.budnhead/graphics/LoadedModel.cs index 9f43618..ae579c0 100644 --- a/org.niclasundharald.engine/graphics/LoadedModel.cs +++ b/org.budnhead/graphics/LoadedModel.cs @@ -5,7 +5,7 @@ using System.Globalization; using OpenTK; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class LoadedModel : Model3D { diff --git a/org.niclasundharald.engine/graphics/Model3D.cs b/org.budnhead/graphics/Model3D.cs similarity index 98% rename from org.niclasundharald.engine/graphics/Model3D.cs rename to org.budnhead/graphics/Model3D.cs index 8e3d738..c075442 100644 --- a/org.niclasundharald.engine/graphics/Model3D.cs +++ b/org.budnhead/graphics/Model3D.cs @@ -3,9 +3,9 @@ using System; using OpenTK.Graphics.OpenGL; using OpenTK; -using org.niclasundharald.engine; +using org.budnhead.core; -namespace org.niclasundharald.engine.graphics { +namespace org.budnhead.graphics { public class Model3D { diff --git a/org.niclasundharald.engine/graphics/ModelManager.cs b/org.budnhead/graphics/ModelManager.cs similarity index 94% rename from org.niclasundharald.engine/graphics/ModelManager.cs rename to org.budnhead/graphics/ModelManager.cs index b57fac1..fe1cc0d 100644 --- a/org.niclasundharald.engine/graphics/ModelManager.cs +++ b/org.budnhead/graphics/ModelManager.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; -namespace org.niclasundharald.engine.graphics +using org.budnhead.core; + +namespace org.budnhead.graphics { public class ModelManager { diff --git a/org.niclasundharald.engine/graphics/Shader.cs b/org.budnhead/graphics/Shader.cs similarity index 96% rename from org.niclasundharald.engine/graphics/Shader.cs rename to org.budnhead/graphics/Shader.cs index 1e8e6f7..e83dc92 100644 --- a/org.niclasundharald.engine/graphics/Shader.cs +++ b/org.budnhead/graphics/Shader.cs @@ -3,7 +3,7 @@ using System.IO; using OpenTK.Graphics.OpenGL; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class Shader { diff --git a/org.niclasundharald.engine/graphics/ShaderProgram.cs b/org.budnhead/graphics/ShaderProgram.cs similarity index 98% rename from org.niclasundharald.engine/graphics/ShaderProgram.cs rename to org.budnhead/graphics/ShaderProgram.cs index d1929af..d185f6c 100644 --- a/org.niclasundharald.engine/graphics/ShaderProgram.cs +++ b/org.budnhead/graphics/ShaderProgram.cs @@ -45,7 +45,7 @@ using OpenTK; **/ -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class ShaderProgram { diff --git a/org.niclasundharald.engine/graphics/SquaredMap.cs b/org.budnhead/graphics/SquaredMap.cs similarity index 98% rename from org.niclasundharald.engine/graphics/SquaredMap.cs rename to org.budnhead/graphics/SquaredMap.cs index 69ccee7..c1b0243 100644 --- a/org.niclasundharald.engine/graphics/SquaredMap.cs +++ b/org.budnhead/graphics/SquaredMap.cs @@ -10,9 +10,10 @@ using OpenTK; using org.hwo.contracts; -using org.niclasundharald.engine; +using org.budnhead.core; +using org.budnhead.exceptions; -namespace org.niclasundharald.engine.graphics +namespace org.budnhead.graphics { public class SquaredMap : WorldObject { diff --git a/org.niclasundharald.engine/graphics/Texture.cs b/org.budnhead/graphics/Texture.cs similarity index 89% rename from org.niclasundharald.engine/graphics/Texture.cs rename to org.budnhead/graphics/Texture.cs index a13511b..6dd24a4 100644 --- a/org.niclasundharald.engine/graphics/Texture.cs +++ b/org.budnhead/graphics/Texture.cs @@ -6,7 +6,7 @@ using OpenTK.Graphics.OpenGL; using ImageSharp; -namespace org.niclasundharald.engine +namespace org.budnhead.core { public class Texture { diff --git a/org.niclasundharald.engine/graphics/primitives/Cube.cs b/org.budnhead/graphics/primitives/Cube.cs similarity index 96% rename from org.niclasundharald.engine/graphics/primitives/Cube.cs rename to org.budnhead/graphics/primitives/Cube.cs index a3b9df7..c69e5cf 100644 --- a/org.niclasundharald.engine/graphics/primitives/Cube.cs +++ b/org.budnhead/graphics/primitives/Cube.cs @@ -1,8 +1,9 @@ using System; using OpenTK; +using org.budnhead.core; -namespace org.niclasundharald.engine.graphics.primitives +namespace org.budnhead.graphics.primitives { public class Cube : WorldObject { diff --git a/org.niclasundharald.engine/graphics/primitives/Triangle.cs b/org.budnhead/graphics/primitives/Triangle.cs similarity index 71% rename from org.niclasundharald.engine/graphics/primitives/Triangle.cs rename to org.budnhead/graphics/primitives/Triangle.cs index 8fab8a7..893acd5 100644 --- a/org.niclasundharald.engine/graphics/primitives/Triangle.cs +++ b/org.budnhead/graphics/primitives/Triangle.cs @@ -1,9 +1,9 @@ using System; using OpenTK; -using org.niclasundharald.engine.graphics; +using org.budnhead.graphics; -namespace org.niclasundharald.engine.graphics.primitives +namespace org.budnhead.graphics.primitives { public class Triangle : GLObject { diff --git a/org.niclasundharald.engine/native/osx/openal-soft/include/AL/al.h b/org.budnhead/native/osx/openal-soft/include/AL/al.h similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/include/AL/al.h rename to org.budnhead/native/osx/openal-soft/include/AL/al.h diff --git a/org.niclasundharald.engine/native/osx/openal-soft/include/AL/alc.h b/org.budnhead/native/osx/openal-soft/include/AL/alc.h similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/include/AL/alc.h rename to org.budnhead/native/osx/openal-soft/include/AL/alc.h diff --git a/org.niclasundharald.engine/native/osx/openal-soft/include/AL/alext.h b/org.budnhead/native/osx/openal-soft/include/AL/alext.h similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/include/AL/alext.h rename to org.budnhead/native/osx/openal-soft/include/AL/alext.h diff --git a/org.niclasundharald.engine/native/osx/openal-soft/include/AL/efx-creative.h b/org.budnhead/native/osx/openal-soft/include/AL/efx-creative.h similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/include/AL/efx-creative.h rename to org.budnhead/native/osx/openal-soft/include/AL/efx-creative.h diff --git a/org.niclasundharald.engine/native/osx/openal-soft/include/AL/efx-presets.h b/org.budnhead/native/osx/openal-soft/include/AL/efx-presets.h similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/include/AL/efx-presets.h rename to org.budnhead/native/osx/openal-soft/include/AL/efx-presets.h diff --git a/org.niclasundharald.engine/native/osx/openal-soft/include/AL/efx.h b/org.budnhead/native/osx/openal-soft/include/AL/efx.h similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/include/AL/efx.h rename to org.budnhead/native/osx/openal-soft/include/AL/efx.h diff --git a/org.niclasundharald.engine/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig-relwithdebinfo.cmake b/org.budnhead/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig-relwithdebinfo.cmake similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig-relwithdebinfo.cmake rename to org.budnhead/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig-relwithdebinfo.cmake diff --git a/org.niclasundharald.engine/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig.cmake b/org.budnhead/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig.cmake similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig.cmake rename to org.budnhead/native/osx/openal-soft/lib/cmake/OpenAL/OpenALConfig.cmake diff --git a/org.niclasundharald.engine/native/osx/openal-soft/lib/libopenal.1.17.2.dylib b/org.budnhead/native/osx/openal-soft/lib/libopenal.1.17.2.dylib similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/lib/libopenal.1.17.2.dylib rename to org.budnhead/native/osx/openal-soft/lib/libopenal.1.17.2.dylib diff --git a/org.niclasundharald.engine/native/osx/openal-soft/lib/libopenal.1.dylib b/org.budnhead/native/osx/openal-soft/lib/libopenal.1.dylib similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/lib/libopenal.1.dylib rename to org.budnhead/native/osx/openal-soft/lib/libopenal.1.dylib diff --git a/org.niclasundharald.engine/native/osx/openal-soft/lib/libopenal.dylib b/org.budnhead/native/osx/openal-soft/lib/libopenal.dylib similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/lib/libopenal.dylib rename to org.budnhead/native/osx/openal-soft/lib/libopenal.dylib diff --git a/org.niclasundharald.engine/native/osx/openal-soft/lib/pkgconfig/openal.pc b/org.budnhead/native/osx/openal-soft/lib/pkgconfig/openal.pc similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/lib/pkgconfig/openal.pc rename to org.budnhead/native/osx/openal-soft/lib/pkgconfig/openal.pc diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/alsoftrc.sample b/org.budnhead/native/osx/openal-soft/share/openal/alsoftrc.sample similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/alsoftrc.sample rename to org.budnhead/native/osx/openal-soft/share/openal/alsoftrc.sample diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/hrtf/default-44100.mhr b/org.budnhead/native/osx/openal-soft/share/openal/hrtf/default-44100.mhr similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/hrtf/default-44100.mhr rename to org.budnhead/native/osx/openal-soft/share/openal/hrtf/default-44100.mhr diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/hrtf/default-48000.mhr b/org.budnhead/native/osx/openal-soft/share/openal/hrtf/default-48000.mhr similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/hrtf/default-48000.mhr rename to org.budnhead/native/osx/openal-soft/share/openal/hrtf/default-48000.mhr diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/3D7.1.ambdec b/org.budnhead/native/osx/openal-soft/share/openal/presets/3D7.1.ambdec similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/3D7.1.ambdec rename to org.budnhead/native/osx/openal-soft/share/openal/presets/3D7.1.ambdec diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/hexagon.ambdec b/org.budnhead/native/osx/openal-soft/share/openal/presets/hexagon.ambdec similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/hexagon.ambdec rename to org.budnhead/native/osx/openal-soft/share/openal/presets/hexagon.ambdec diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/itu5.1.ambdec b/org.budnhead/native/osx/openal-soft/share/openal/presets/itu5.1.ambdec similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/itu5.1.ambdec rename to org.budnhead/native/osx/openal-soft/share/openal/presets/itu5.1.ambdec diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/presets.txt b/org.budnhead/native/osx/openal-soft/share/openal/presets/presets.txt similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/presets.txt rename to org.budnhead/native/osx/openal-soft/share/openal/presets/presets.txt diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/rectangle.ambdec b/org.budnhead/native/osx/openal-soft/share/openal/presets/rectangle.ambdec similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/rectangle.ambdec rename to org.budnhead/native/osx/openal-soft/share/openal/presets/rectangle.ambdec diff --git a/org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/square.ambdec b/org.budnhead/native/osx/openal-soft/share/openal/presets/square.ambdec similarity index 100% rename from org.niclasundharald.engine/native/osx/openal-soft/share/openal/presets/square.ambdec rename to org.budnhead/native/osx/openal-soft/share/openal/presets/square.ambdec diff --git a/org.budnhead/org.budnhead.csproj b/org.budnhead/org.budnhead.csproj new file mode 100644 index 0000000..5af4595 --- /dev/null +++ b/org.budnhead/org.budnhead.csproj @@ -0,0 +1,177 @@ + + + + Debug + AnyCPU + {3E812F66-D5F3-4599-8360-97F355B6CC1B} + Library + org.budnhead + org.budnhead + v4.5 + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + + + true + bin\Release + prompt + 4 + false + + + + + ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + + + ..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll + + + contrib\ImageSharp.dll + + + + + + ..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + + + PreserveNewest + + + + + + + + + + + + + + {56733EC1-7D97-48D0-AA4C-98EA624A5A21} + org.hwo.contracts + + + + + + {56733EC1-7D97-48D0-AA4C-98EA624A5A21} + org.hwo.contracts + + + + diff --git a/org.niclasundharald.engine/packages.config b/org.budnhead/packages.config similarity index 100% rename from org.niclasundharald.engine/packages.config rename to org.budnhead/packages.config diff --git a/org.niclasundharald.engine/exceptions/OutOfWorldException.cs b/org.niclasundharald.engine/exceptions/OutOfWorldException.cs deleted file mode 100644 index 1388111..0000000 --- a/org.niclasundharald.engine/exceptions/OutOfWorldException.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -namespace org.niclasundharald.engine -{ - public class OutOfWorldException : Exception - { - public OutOfWorldException() - { - } - } -} diff --git a/org.niclasundharald.engine/org.niclasundharald.engine.csproj b/org.niclasundharald.engine/org.budnhead.csproj similarity index 100% rename from org.niclasundharald.engine/org.niclasundharald.engine.csproj rename to org.niclasundharald.engine/org.budnhead.csproj