Wpf System test
This commit is contained in:
parent
af9c782c1e
commit
9ad4bc1c69
17 changed files with 746 additions and 12 deletions
|
|
@ -10,7 +10,8 @@ namespace Map3DRendering {
|
|||
|
||||
private readonly Vector3 _lightPos = new Vector3(0x10, 0, 0x10);
|
||||
|
||||
private MapRender mapRender;
|
||||
//private MapRender mapRender;
|
||||
private WorldMapRender _render;
|
||||
private AxesGizmo axesGizmo;
|
||||
|
||||
private Shader _shader;
|
||||
|
|
@ -33,7 +34,8 @@ namespace Map3DRendering {
|
|||
public Window(GameWindowSettings gameWindowSettings, NativeWindowSettings nativeWindowSettings)
|
||||
: base(gameWindowSettings, nativeWindowSettings) {
|
||||
|
||||
mapRender = new MapRender();
|
||||
//mapRender = new MapRender();
|
||||
_render = new WorldMapRender();
|
||||
|
||||
GL.GetInteger(GetPName.MaxTextureImageUnits, out maxTextures);
|
||||
}
|
||||
|
|
@ -49,10 +51,11 @@ namespace Map3DRendering {
|
|||
GL.GetInteger(GetPName.MaxTextureImageUnits, out maxTextureUnits);
|
||||
Console.WriteLine($"Maximum number of texture units for fragment shaders: {maxTextureUnits}");
|
||||
|
||||
_shader = new Shader("Shaders/shader.vert", "Shaders/shader.frag");
|
||||
_shader = new Shader("Shaders/shader.vert", "Shaders/shadertest.frag");
|
||||
_shader.Use();
|
||||
|
||||
mapRender.OnLoad(_shader);
|
||||
//mapRender.OnLoad(_shader);
|
||||
_render.OnLoad(_shader);
|
||||
|
||||
var file = Directory.EnumerateFiles(@"./terrains");
|
||||
_texture = Texture.LoadFromArray(file.ToArray());
|
||||
|
|
@ -82,14 +85,15 @@ namespace Map3DRendering {
|
|||
_shader.SetMatrix4("projection", _camera.GetProjectionMatrix());
|
||||
|
||||
//_shader.SetVector3("objectColor", new Vector3(0.5f, 0.5f, 0.5f));
|
||||
_shader.SetVector3("lightColor", new Vector3(1.0f, 1.0f, 1.0f));
|
||||
_shader.SetVector3("lightPos", _camera.Position);
|
||||
//_shader.SetVector3("lightColor", new Vector3(1.0f, 1.0f, 1.0f));
|
||||
//_shader.SetVector3("lightPos", _camera.Position);
|
||||
|
||||
GL.LineWidth(5.0f);
|
||||
|
||||
_shader.SetVector3("viewPos", _camera.Position);
|
||||
mapRender.UpdateBlocks(_camera.Position, _shader);
|
||||
mapRender.Render(_shader);
|
||||
//_shader.SetVector3("viewPos", _camera.Position);
|
||||
//mapRender.UpdateBlocks(_camera.Position, _shader);
|
||||
//mapRender.Render(_shader);
|
||||
_render.Render(_shader);
|
||||
|
||||
axesGizmo.Render(Size.X, Size.Y, _camera);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue