mirror of
https://github.com/4sval/FModel.git
synced 2026-04-20 16:47:44 -05:00
bump ogl to 4.6
This commit is contained in:
parent
35f3ce38fb
commit
2c4c1faeaa
|
|
@ -121,7 +121,7 @@ public class ImGuiController : IDisposable
|
|||
|
||||
RecreateFontDeviceTexture();
|
||||
|
||||
string VertexSource = @"#version 330 core
|
||||
string VertexSource = @"#version 460 core
|
||||
uniform mat4 projection_matrix;
|
||||
layout(location = 0) in vec2 in_position;
|
||||
layout(location = 1) in vec2 in_texCoord;
|
||||
|
|
@ -134,7 +134,7 @@ gl_Position = projection_matrix * vec4(in_position, 0, 1);
|
|||
color = in_color;
|
||||
texCoord = in_texCoord;
|
||||
}";
|
||||
string FragmentSource = @"#version 330 core
|
||||
string FragmentSource = @"#version 460 core
|
||||
uniform sampler2D in_fontTexture;
|
||||
in vec4 color;
|
||||
in vec2 texCoord;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
#define PI 3.1415926535897932384626433832795
|
||||
#define MAX_UV_COUNT 8
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
layout (location = 1) in vec3 vPos;
|
||||
layout (location = 2) in vec3 vNormal;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
in vec2 fTexCoords;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
layout (location = 0) in vec2 vPos;
|
||||
layout (location = 1) in vec2 vTexCoords;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 430 core
|
||||
#version 460 core
|
||||
|
||||
// --------------------- IN ---------------------
|
||||
in OUT_IN_VARIABLES {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 430 core
|
||||
#version 460 core
|
||||
|
||||
layout (location = 0) in vec3 vPos;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330
|
||||
#version 460 core
|
||||
|
||||
uniform sampler2D uIcon;
|
||||
uniform vec4 uColor;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
layout (location = 0) in vec3 vPos;
|
||||
layout (location = 9) in mat4 vInstanceMatrix;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330
|
||||
#version 460 core
|
||||
|
||||
out vec4 FragColor;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
layout (location = 1) in vec3 vPos;
|
||||
layout (location = 2) in vec3 vNormal;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330
|
||||
#version 460 core
|
||||
|
||||
uniform uint uA;
|
||||
uniform uint uB;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
layout (location = 1) in vec3 vPos;
|
||||
layout (location = 9) in mat4 vInstanceMatrix;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
in vec3 fPos;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 460 core
|
||||
|
||||
layout (location = 0) in vec3 vPos;
|
||||
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ public class CUE4ParseViewModel : ViewModel
|
|||
WindowBorder = WindowBorder.Resizable,
|
||||
Flags = ContextFlags.ForwardCompatible,
|
||||
Profile = ContextProfile.Core,
|
||||
APIVersion = new Version(4, 6),
|
||||
StartVisible = false,
|
||||
StartFocused = false,
|
||||
Title = "3D Viewer"
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ public class Snooper : GameWindow
|
|||
var newCamera = Renderer.Load(cancellationToken, export) ?? new Camera();
|
||||
if (newCamera.Speed > _previousSpeed)
|
||||
{
|
||||
newCamera.Zoom = Camera.Zoom;
|
||||
Camera = newCamera;
|
||||
_previousSpeed = Camera.Speed;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user