move GL shaders into the correct folder
This commit is contained in:
+2
-2
@@ -114,8 +114,8 @@ public class GlDhDebugWireframeRenderer extends AbstractDebugWireframeRenderer
|
||||
this.va.setVertexAttribute(0, 0, GlVertexPointer.addVec3Pointer(false));
|
||||
this.va.completeAndCheck(Float.BYTES * 3);
|
||||
this.basicShader = new GlShaderProgram(
|
||||
"shaders/debug/vert.vert",
|
||||
"shaders/debug/frag.frag",
|
||||
"assets/distanthorizons/shaders/debug/gl/vert.vert",
|
||||
"assets/distanthorizons/shaders/debug/gl/frag.frag",
|
||||
"vPosition"
|
||||
);
|
||||
this.createBuffer();
|
||||
|
||||
+2
-2
@@ -109,8 +109,8 @@ public class GlDhTerrainShaderProgram extends GlShaderProgram implements IDhApiS
|
||||
private GlDhTerrainShaderProgram()
|
||||
{
|
||||
super(
|
||||
"shaders/standard.vert",
|
||||
"shaders/flat_shaded.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/standard.vert",
|
||||
"assets/distanthorizons/shaders/shared/gl/flat_shaded.frag",
|
||||
new String[]{"vPosition", "color"}
|
||||
);
|
||||
|
||||
|
||||
+4
-4
@@ -17,10 +17,10 @@ import com.seibel.distanthorizons.core.util.math.Vec3f;
|
||||
|
||||
public class GlGenericObjectShaderProgram extends GlShaderProgram implements IDhApiGenericObjectShaderProgram
|
||||
{
|
||||
public static final String VERTEX_SHADER_INSTANCED_PATH = "shaders/genericObject/instanced/vert.vert";
|
||||
public static final String VERTEX_SHADER_DIRECT_PATH = "shaders/genericObject/direct/vert.vert";
|
||||
public static final String FRAGMENT_SHADER_INSTANCED_PATH = "shaders/genericObject/instanced/frag.frag";
|
||||
public static final String FRAGMENT_SHADER_DIRECT_PATH = "shaders/genericObject/direct/frag.frag";
|
||||
public static final String VERTEX_SHADER_INSTANCED_PATH = "assets/distanthorizons/shaders/generic/gl/instanced/vert.vert";
|
||||
public static final String VERTEX_SHADER_DIRECT_PATH = "assets/distanthorizons/shaders/generic/gl/direct/vert.vert";
|
||||
public static final String FRAGMENT_SHADER_INSTANCED_PATH = "assets/distanthorizons/shaders/generic/gl/instanced/frag.frag";
|
||||
public static final String FRAGMENT_SHADER_DIRECT_PATH = "assets/distanthorizons/shaders/generic/gl/direct/frag.frag";
|
||||
|
||||
public final GlAbstractVertexAttribute va;
|
||||
|
||||
|
||||
+2
-2
@@ -57,8 +57,8 @@ public class GlDhApplyShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/apply.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/shared/gl/apply.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -59,8 +59,8 @@ public class GlDhFarFadeApplyShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/fade/apply.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/fade/gl/apply.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -69,8 +69,8 @@ public class GlDhFarFadeShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/fade/dhFade.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/fade/gl/dhFade.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -77,8 +77,8 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/fade/vanillaFade.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/fade/gl/vanillaFade.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -57,8 +57,8 @@ public class GlDhFogApplyShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/fog/apply.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/fog/gl/apply.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -109,8 +109,8 @@ public class GlDhFogShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/fog/fog.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/fog/gl/fog.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -62,8 +62,8 @@ public class GlDhSSAOApplyShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/ssao/apply.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/ssao/gl/apply.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -70,8 +70,8 @@ public class GlDhSSAOShader extends GlAbstractShaderRenderer
|
||||
public void onInit()
|
||||
{
|
||||
this.shader = new GlShaderProgram(
|
||||
"shaders/quadApply.vert",
|
||||
"shaders/ssao/ao.frag",
|
||||
"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
|
||||
"assets/distanthorizons/shaders/ssao/gl/ao.frag",
|
||||
"vPosition"
|
||||
);
|
||||
|
||||
|
||||
+2
-2
@@ -94,8 +94,8 @@ public class GlTestTriangleRenderer implements IDhTestTriangleRenderer
|
||||
this.va.setVertexAttribute(0, 1, GlVertexPointer.addVec4Pointer(false));
|
||||
this.va.completeAndCheck(Float.BYTES * 6);
|
||||
this.basicShader = new GlShaderProgram(
|
||||
"shaders/test/vert.vert",
|
||||
"shaders/test/frag.frag",
|
||||
"assets/distanthorizons/shaders/test/gl/vert.vert",
|
||||
"assets/distanthorizons/shaders/test/gl/frag.frag",
|
||||
new String[]{"vPosition", "color"});
|
||||
|
||||
this.createBuffer();
|
||||
|
||||
+1
-1
Submodule coreSubProjects updated: e426fc2380...1bbe41c068
Reference in New Issue
Block a user