Skip to content

Commit

Permalink
some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
colin-dumitru committed Mar 2, 2012
1 parent 2461372 commit be9cffb
Show file tree
Hide file tree
Showing 44 changed files with 29,862 additions and 43 deletions.
2 changes: 0 additions & 2 deletions App/Data/ResourceManager.cs
Expand Up @@ -180,8 +180,6 @@ public class ShaderLoader : IResourceLoader {
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------


public class ResourceManager : IResourceManager {

private readonly Dictionary<String, IResourceLoader> _loaders = new Dictionary<string, IResourceLoader>();
Expand Down
4 changes: 4 additions & 0 deletions Engine/Engine.csproj
Expand Up @@ -55,7 +55,10 @@
<Compile Include="Graphics\IShaderProgram.cs" />
<Compile Include="Graphics\IUniformLocation.cs" />
<Compile Include="Graphics\Material.cs" />
<Compile Include="Graphics\Mesh.cs" />
<Compile Include="Resource\Library.cs" />
<Compile Include="Universe\Component.cs" />
<Compile Include="Universe\MeshComponent.cs" />
<Compile Include="Universe\Node.cs" />
<Compile Include="Universe\World.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -66,5 +69,6 @@
<Name>Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(ProgramFiles)\ScriptSharp\v1.0\ScriptSharp.targets" />
</Project>
12 changes: 12 additions & 0 deletions Engine/Graphics/Mesh.cs
@@ -0,0 +1,12 @@
// Mesh.cs
//

using System;
using System.Collections.Generic;

namespace GLSharp.Graphics
{
public class Mesh
{
}
}
34 changes: 34 additions & 0 deletions Engine/Resource/Library.cs
@@ -0,0 +1,34 @@
// Library.cs
//

using System;
using System.Collections.Generic;
using GLSharp.Graphics;

namespace GLSharp.Resource
{
public class Library
{
private Dictionary<String, ICompiledShader> _shaderSet;

/// <summary>
/// The complete set of shaders used for drawing.
/// </summary>
public Dictionary<String, ICompiledShader> ShaderSet {
get { return _shaderSet; }
set { _shaderSet = value; }
}

private Dictionary<String, Mesh> _meshSet;

/// <summary>
/// The complete collection of Meshes used for rendering.
/// </summary>
public Dictionary<String, Mesh> MeshSet
{
get { return _meshSet; }
set { _meshSet = value; }
}

}
}
2 changes: 1 addition & 1 deletion Engine/Universe/Component.cs
Expand Up @@ -6,7 +6,7 @@

namespace GLSharp.Universe {
public abstract class Component {
private String _type;
protected String _type;

/// <summary>
/// Unique type of the component.
Expand Down
14 changes: 14 additions & 0 deletions Engine/Universe/MeshComponent.cs
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;

namespace GLSharp.Universe {
public class MeshComponent : Component {
public MeshComponent() {
/*set the type*/
this._type = "mesh";
}


}
}
2 changes: 1 addition & 1 deletion GLSharp.Tests/GLSharp.Tests.csproj
Expand Up @@ -49,7 +49,7 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
</ItemGroup>
Expand Down
Binary file modified GLSharp.suo
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit be9cffb

Please sign in to comment.