nhengine -> budnhead

audio-streams
Harald Christian Joachim Wolff 2017-05-09 23:41:50 +02:00
parent beaaba3393
commit 634da6fe0b
90 changed files with 434 additions and 100 deletions

View File

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

View File

@ -4,7 +4,7 @@ using System.IO;
using OpenTK.Graphics.OpenGL;
using OpenTK;
namespace nhengine
namespace bnhdemo
{
public class Graphics
{

View File

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 185 KiB

View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

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

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using OpenTK.Graphics.OpenGL4;
namespace nhengine
namespace bnhdemo
{
public class TextureManager
{

View File

@ -0,0 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{42BCFEF7-3F24-469A-BD46-E0C9C2C20D21}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>nhengine</RootNamespace>
<AssemblyName>nhengine</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PlatformTarget>anycpu</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Buffers">
<HintPath>..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Numerics.Vectors">
<HintPath>..\packages\System.Numerics.Vectors.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Runtime.CompilerServices.Unsafe">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="OpenTK">
<HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="ImageSharp">
<HintPath>..\org.budnhead\contrib\ImageSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="BootStrap.cs" />
<Compile Include="Graphics.cs" />
<Compile Include="OpenGLWindow.cs" />
<Compile Include="TextureManager.cs" />
</ItemGroup>
<ItemGroup>
<None Include="OpenTK.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="shader\simple_fragment.shader" />
<None Include="shader\simple_vertex.shader" />
<None Include="M3-wip.bmp">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="M3-wip.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="models\alfa147.obj">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Notes.txt" />
<None Include="models\ballistisch.obj">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="sounds\seq03.wav" />
<None Include="sounds\seq02.wav" />
<None Include="sounds\seq01.wav" />
<None Include="sounds\st2.wav" />
<None Include="sounds\st1.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="sounds\sfx2.wav" />
<None Include="sounds\sfx1.wav" />
<None Include="sounds\HowHit.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="sounds\HowFire.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\org.hwo.contracts\org.hwo.contracts.csproj">
<Project>{56733EC1-7D97-48D0-AA4C-98EA624A5A21}</Project>
<Name>org.hwo.contracts</Name>
</ProjectReference>
<ProjectReference Include="..\org.budnhead\org.budnhead.csproj">
<Project>{3E812F66-D5F3-4599-8360-97F355B6CC1B}</Project>
<Name>org.budnhead</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="sounds\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

View File

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

View File

@ -1,7 +1,7 @@
using System;
namespace org.niclasundharald.engine
namespace org.budnhead.core
{
public static class ArrayHelper
{

View File

@ -1,7 +1,7 @@
using System;
using System.IO;
namespace org.niclasundharald.engine
namespace org.budnhead.core
{
public static class FileHelper
{

View File

@ -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")]

View File

@ -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.");
}

View File

@ -5,7 +5,7 @@ using OpenTK.Audio.OpenAL;
namespace nhengine.Audio
namespace org.budnhead.audio
{
public class nhAux
{

View File

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

View File

@ -4,7 +4,7 @@ using OpenTK.Audio;
using OpenTK.Audio.OpenAL;
namespace nhengine.Audio
namespace org.budnhead.audio
{
public static class nhListener

View File

@ -7,7 +7,7 @@ using OpenTK.Audio.OpenAL;
using System.Windows.Forms;
namespace nhengine.Audio
namespace org.budnhead.audio
{
public static class nhMixer
{

View File

@ -7,7 +7,7 @@ using OpenTK.Audio.OpenAL;
namespace nhengine.Audio
namespace org.budnhead.audio
{
public class nhPlayer
{

View File

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

View File

@ -1,5 +1,5 @@
using System;
namespace org.niclasundharald.engine
namespace org.budnhead.core
{
/**
* @class ActorAction

View File

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

View File

@ -1,5 +1,5 @@
using System;
namespace org.niclasundharald.engine
namespace org.budnhead.core
{
public enum BallisticActorStates
{

View File

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

View File

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

View File

@ -2,7 +2,7 @@
using OpenTK;
namespace org.niclasundharald.engine
namespace org.budnhead.core
{
public abstract class Physics
{

View File

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

View File

@ -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){
}
}
}

View File

@ -0,0 +1,7 @@
using System;
namespace org.budnhead.exceptions
{
public class OutOfWorldException : BudNHeadException{
}
}

View File

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

View File

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

View File

@ -5,7 +5,7 @@ using OpenTK.Graphics;
using OpenTK;
namespace org.niclasundharald.engine.graphics
namespace org.budnhead.graphics
{
public class GLObject
{

View File

@ -1,8 +1,9 @@
using System;
using OpenTK;
using org.budnhead.core;
namespace org.niclasundharald.engine.graphics
namespace org.budnhead.graphics
{
public class GLScene
{

View File

@ -3,7 +3,7 @@
using OpenTK;
using OpenTK.Graphics.OpenGL;
namespace org.niclasundharald.engine.graphics
namespace org.budnhead.graphics
{
public class GLSceneOrientation
{

View File

@ -2,7 +2,7 @@
using OpenTK.Graphics.OpenGL;
namespace org.niclasundharald.engine.graphics
namespace org.budnhead.graphics
{
public class GlobalDefaults
{

View File

@ -5,7 +5,7 @@ using System.Globalization;
using OpenTK;
namespace org.niclasundharald.engine.graphics
namespace org.budnhead.graphics
{
public class LoadedModel : Model3D
{

View File

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

View File

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

View File

@ -3,7 +3,7 @@ using System.IO;
using OpenTK.Graphics.OpenGL;
namespace org.niclasundharald.engine.graphics
namespace org.budnhead.graphics
{
public class Shader
{

View File

@ -45,7 +45,7 @@ using OpenTK;
**/
namespace org.niclasundharald.engine.graphics
namespace org.budnhead.graphics
{
public class ShaderProgram
{

View File

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

View File

@ -6,7 +6,7 @@ using OpenTK.Graphics.OpenGL;
using ImageSharp;
namespace org.niclasundharald.engine
namespace org.budnhead.core
{
public class Texture
{

View File

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

View File

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

View File

@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3E812F66-D5F3-4599-8360-97F355B6CC1B}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>org.budnhead</RootNamespace>
<AssemblyName>org.budnhead</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="OpenTK">
<HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="OpenTK.GLControl">
<HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
</Reference>
<Reference Include="ImageSharp">
<HintPath>contrib\ImageSharp.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Buffers">
<HintPath>..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="graphics\GLCamera.cs" />
<Compile Include="graphics\GLObject.cs" />
<Compile Include="graphics\Shader.cs" />
<Compile Include="graphics\ShaderProgram.cs" />
<Compile Include="graphics\GlobalDefaults.cs" />
<Compile Include="graphics\primitives\Cube.cs" />
<Compile Include="graphics\primitives\Triangle.cs" />
<Compile Include="graphics\GLSceneOrientation.cs" />
<Compile Include="graphics\GLModel.cs" />
<Compile Include="graphics\GLScene.cs" />
<Compile Include="graphics\Model3D.cs" />
<Compile Include="graphics\ModelManager.cs" />
<Compile Include="FileHelper.cs" />
<Compile Include="graphics\Texture.cs" />
<Compile Include="graphics\LoadedModel.cs" />
<Compile Include="graphics\SquaredMap.cs" />
<Compile Include="exceptions\OutOfWorldException.cs" />
<Compile Include="audio\nhPlayer.cs" />
<Compile Include="audio\AudioDelegate.cs" />
<Compile Include="audio\nhBuffers.cs" />
<Compile Include="audio\nhListener.cs" />
<Compile Include="ArrayHelper.cs" />
<Compile Include="core\Actor.cs" />
<Compile Include="core\ActorAction.cs" />
<Compile Include="core\BallisticActor.cs" />
<Compile Include="core\BallisticActorStates.cs" />
<Compile Include="core\Geometry.cs" />
<Compile Include="core\Linear.cs" />
<Compile Include="core\Physics.cs" />
<Compile Include="core\WorldObject.cs" />
<Compile Include="exceptions\BudNHeadException.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Gameplay Object Tree.txt" />
<None Include="audio\nhAux.cs" />
<None Include="audio\nhMixer.cs" />
<None Include="native\osx\openal-soft\bin\alsoft-config" />
<None Include="native\osx\openal-soft\bin\altonegen" />
<None Include="native\osx\openal-soft\bin\bsincgen" />
<None Include="native\osx\openal-soft\bin\makehrtf" />
<None Include="native\osx\openal-soft\bin\openal-info" />
<None Include="native\osx\openal-soft\include\AL\al.h" />
<None Include="native\osx\openal-soft\include\AL\alc.h" />
<None Include="native\osx\openal-soft\include\AL\alext.h" />
<None Include="native\osx\openal-soft\include\AL\efx-creative.h" />
<None Include="native\osx\openal-soft\include\AL\efx-presets.h" />
<None Include="native\osx\openal-soft\include\AL\efx.h" />
<None Include="native\osx\openal-soft\lib\libopenal.1.17.2.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="native\osx\openal-soft\lib\libopenal.1.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="native\osx\openal-soft\lib\libopenal.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="native\osx\openal-soft\lib\cmake\OpenAL\OpenALConfig-relwithdebinfo.cmake" />
<None Include="native\osx\openal-soft\lib\cmake\OpenAL\OpenALConfig.cmake" />
<None Include="native\osx\openal-soft\lib\pkgconfig\openal.pc" />
<None Include="native\osx\openal-soft\share\openal\alsoftrc.sample" />
<None Include="native\osx\openal-soft\share\openal\hrtf\default-44100.mhr" />
<None Include="native\osx\openal-soft\share\openal\hrtf\default-48000.mhr" />
<None Include="native\osx\openal-soft\share\openal\presets\3D7.1.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\hexagon.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\itu5.1.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\presets.txt" />
<None Include="native\osx\openal-soft\share\openal\presets\rectangle.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\square.ambdec" />
<None Include="native\osx\openal-soft\bin\alsoft-config" />
<None Include="native\osx\openal-soft\bin\altonegen" />
<None Include="native\osx\openal-soft\bin\bsincgen" />
<None Include="native\osx\openal-soft\bin\makehrtf" />
<None Include="native\osx\openal-soft\bin\openal-info" />
<None Include="native\osx\openal-soft\include\AL\al.h" />
<None Include="native\osx\openal-soft\include\AL\alc.h" />
<None Include="native\osx\openal-soft\include\AL\alext.h" />
<None Include="native\osx\openal-soft\include\AL\efx-creative.h" />
<None Include="native\osx\openal-soft\include\AL\efx-presets.h" />
<None Include="native\osx\openal-soft\include\AL\efx.h" />
<None Include="native\osx\openal-soft\lib\libopenal.1.17.2.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="native\osx\openal-soft\lib\libopenal.1.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="native\osx\openal-soft\lib\libopenal.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="native\osx\openal-soft\lib\cmake\OpenAL\OpenALConfig-relwithdebinfo.cmake" />
<None Include="native\osx\openal-soft\lib\cmake\OpenAL\OpenALConfig.cmake" />
<None Include="native\osx\openal-soft\lib\pkgconfig\openal.pc" />
<None Include="native\osx\openal-soft\share\openal\alsoftrc.sample" />
<None Include="native\osx\openal-soft\share\openal\hrtf\default-44100.mhr" />
<None Include="native\osx\openal-soft\share\openal\hrtf\default-48000.mhr" />
<None Include="native\osx\openal-soft\share\openal\presets\3D7.1.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\hexagon.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\itu5.1.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\presets.txt" />
<None Include="native\osx\openal-soft\share\openal\presets\rectangle.ambdec" />
<None Include="native\osx\openal-soft\share\openal\presets\square.ambdec" />
<None Include="contrib\ImageSharp.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="graphics\" />
<Folder Include="graphics\primitives\" />
<Folder Include="contrib\" />
<Folder Include="contrib\ImageSharp.dll">
</Folder>
<Folder Include="exceptions\" />
<Folder Include="core\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\org.hwo.contracts\org.hwo.contracts.csproj">
<Project>{56733EC1-7D97-48D0-AA4C-98EA624A5A21}</Project>
<Name>org.hwo.contracts</Name>
</ProjectReference>
<Folder Include="audio\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\org.hwo.contracts\org.hwo.contracts.csproj">
<Project>{56733EC1-7D97-48D0-AA4C-98EA624A5A21}</Project>
<Name>org.hwo.contracts</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -1,10 +0,0 @@
using System;
namespace org.niclasundharald.engine
{
public class OutOfWorldException : Exception
{
public OutOfWorldException()
{
}
}
}