me/Diamond
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suggested changes

Browse Source
This commit is contained in:
David Allemang
2017-03-07 02:16:21 -05:00
parent 90b7545758
commit 9f64d7f2cd
6 changed files with 79 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hexworld/Driver.cs
View File

@@ -5,11 +5,6 @@
public static void Main(string[] args)
{
using (var gw = new HexRender(1280, 720)) gw.Run();
// var tile = JsonConvert.DeserializeObject<TileInfo>("{\"mesh\":\"RightColumn\", \"pos\": {\"x\": 1, \"y\": 2, \"z\": 3}}");
//
// Console.Out.WriteLine("tile = {0}", tile);
// Console.ReadKey();
}
}
}

37
hexworld/HexRender.cs
View File

@@ -46,7 +46,6 @@ namespace hexworld
#endregion
private List<RenderGroup<TileData, ObjVertex>> _renderGroups;
// private RenderGroup<TileData, ObjVertex> _renderGroup;
private Camera _camera;
@@ -100,25 +99,25 @@ namespace hexworld
_camera = new Camera();
_renderGroups = new List<RenderGroup<TileData, ObjVertex>>();
_renderGroups.Add(new RenderGroup<TileData, ObjVertex>()
_renderGroups = new List<RenderGroup<TileData, ObjVertex>>
{
Vertices = _meshVbos["Cube"],
Instance = _tileVbos[0],
Program = _texPgm,
Texture = _stoneTex,
Camera = _camera,
});
_renderGroups.Add(new RenderGroup<TileData, ObjVertex>()
{
Vertices = _meshVbos["Cube"],
Instance = _tileVbos[1],
Program = _texPgm,
Texture = _grassTex,
Camera = _camera,
});
new RenderGroup<TileData, ObjVertex>()
{
Vertices = _meshVbos["Cube"],
Instance = _tileVbos[0],
Program = _texPgm,
Texture = _stoneTex,
Camera = _camera,
},
new RenderGroup<TileData, ObjVertex>()
{
Vertices = _meshVbos["Cube"],
Instance = _tileVbos[1],
Program = _texPgm,
Texture = _grassTex,
Camera = _camera,
}
};
}
protected override void OnUpdateFrame(FrameEventArgs e)