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

Added rudimentary texture loading in Level. It, too, sucks, but works as a prototype

Browse Source
This commit is contained in:
David Allemang
2017-02-27 23:27:16 -05:00
parent 1824de6842
commit 4d4eea54bb
4 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hexworld/HexRender.cs
View File

@@ -15,22 +15,12 @@ namespace hexworld
#region GLObjects
private Texture _grass;
private Texture _stone;
private Texture _gray;
private Texture _door;
private Level _level;
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
_grass?.Dispose();
_stone?.Dispose();
_gray?.Dispose();
_door?.Dispose();
_level?.Dispose();
}
@@ -58,11 +48,6 @@ namespace hexworld
base.OnLoad(e);
_level = Level.LoadLevel(@"res\level.json");
_grass = Texture.FromBitmap(new Bitmap(@"res\grass.png"));
_stone = Texture.FromBitmap(new Bitmap(@"res\stone.png"));
_gray = Texture.FromBitmap(new Bitmap(@"res\gray.png"));
_door = Texture.FromBitmap(new Bitmap(@"res\door.png"));
}
protected override void OnUpdateFrame(FrameEventArgs e)
@@ -90,14 +75,9 @@ namespace hexworld
GL.Enable(EnableCap.Blend);
GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
_grass.Bind(0);
_stone.Bind(1);
_gray.Bind(2);
_door.Bind(3);
var pgm = _level.Programs["textured"];
pgm.Use();
GL.Uniform1(pgm.GetUniform("tex"), 0);
GL.UniformMatrix4(pgm.GetUniform("view"), false, ref _view);
GL.UniformMatrix4(pgm.GetUniform("proj"), false, ref _proj);

75
hexworld/res/level.json
View File

@@ -12,41 +12,46 @@
]
}
],
"textures":
[
"grass.png",
"door.png"
],
"tiles": [
{ "mesh": "BaseLeft", "shader": "textured", "pos": { "x": -1, "y": 0, "z": 0 } },
{ "mesh": "BaseRight", "shader": "textured", "pos": { "x": 1, "y": 0, "z": 0 } },
{ "mesh": "Stairs", "shader": "textured", "pos": { "x": 0, "y": 0, "z": 0 } },
{ "mesh": "ColLeft", "shader": "textured", "pos": { "x": -1, "y": 0, "z": 1 } },
{ "mesh": "ColRight", "shader": "textured", "pos": { "x": 1, "y": 0, "z": 1 } },
{ "mesh": "ColLeft", "shader": "textured", "pos": { "x": -1, "y": 0, "z": 2 } },
{ "mesh": "ColRight", "shader": "textured", "pos": { "x": 1, "y": 0, "z": 2 } },
{ "mesh": "CapLeft", "shader": "textured", "pos": { "x": -1, "y": 0, "z": 3 } },
{ "mesh": "Lintel", "shader": "textured", "pos": { "x": 0, "y": 0, "z": 3 } },
{ "mesh": "CapRight", "shader": "textured", "pos": { "x": 1, "y": 0, "z": 3 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -2, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -2, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -2, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -2, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -2, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -1, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -1, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -1, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -1, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": -1, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 0, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 0, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 0, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 0, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 0, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 1, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 1, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 1, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 1, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 1, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 2, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 2, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 2, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 2, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "pos": { "x": 2, "y": 2, "z": -1 } },
{ "mesh": "BaseLeft", "shader": "textured", "tex": "door.png", "pos": { "x": -1, "y": 0, "z": 0 } },
{ "mesh": "BaseRight", "shader": "textured", "tex": "door.png", "pos": { "x": 1, "y": 0, "z": 0 } },
{ "mesh": "Stairs", "shader": "textured", "tex": "door.png", "pos": { "x": 0, "y": 0, "z": 0 } },
{ "mesh": "ColLeft", "shader": "textured", "tex": "door.png", "pos": { "x": -1, "y": 0, "z": 1 } },
{ "mesh": "ColRight", "shader": "textured", "tex": "door.png", "pos": { "x": 1, "y": 0, "z": 1 } },
{ "mesh": "ColLeft", "shader": "textured", "tex": "door.png", "pos": { "x": -1, "y": 0, "z": 2 } },
{ "mesh": "ColRight", "shader": "textured", "tex": "door.png", "pos": { "x": 1, "y": 0, "z": 2 } },
{ "mesh": "CapLeft", "shader": "textured", "tex": "door.png", "pos": { "x": -1, "y": 0, "z": 3 } },
{ "mesh": "Lintel", "shader": "textured", "tex": "door.png", "pos": { "x": 0, "y": 0, "z": 3 } },
{ "mesh": "CapRight", "shader": "textured", "tex": "door.png", "pos": { "x": 1, "y": 0, "z": 3 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -2, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -2, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -2, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -2, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -2, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -1, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -1, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -1, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -1, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": -1, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 0, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 0, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 0, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 0, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 0, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 1, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 1, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 1, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 1, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 1, "y": 2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 2, "y": -2, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 2, "y": -1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 2, "y": 0, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 2, "y": 1, "z": -1 } },
{ "mesh": "Cube", "shader": "textured", "tex": "grass.png", "pos": { "x": 2, "y": 2, "z": -1 } },
]
}