render entities

src/td/render/shader/EntityShader.cpp

@@ -53,16 +53,12 @@ static const char vertexSource[] = R"(
 #version 330
 
 layout(location = 0) in vec3 position;
-layout(location = 1) in vec2 textureCoords;
 
 uniform mat4 viewMatrix;
 uniform mat4 projectionMatrix;
 uniform vec3 modelPosition;
 
-out vec2 pass_textureCoords;
-
 void main(void){
-	pass_textureCoords = textureCoords;
 	gl_Position = projectionMatrix * viewMatrix * vec4(position + modelPosition, 1.0);
 }
 )";
@@ -70,16 +66,13 @@ void main(void){
 static const char fragmentSource[] = R"(
 #version 330
 
-in vec2 pass_textureCoords;
-
 out vec4 out_color;
 
 uniform vec3 ColorEffect;
-uniform sampler2D textureSampler;
 
 void main(void){
 
-	vec4 color = vec4(ColorEffect, 1.0) * texture(textureSampler, pass_textureCoords);
+	vec4 color = vec4(ColorEffect, 1.0);
 
 	if (color.a <= 0.1)
 		discard;
@@ -90,31 +83,21 @@ void main(void){
 )";
 #endif
 
-EntityShader::EntityShader() : ShaderProgram() {}
-
-void EntityShader::LoadShader() {
+EntityShader::EntityShader() : CameraShaderProgram() {
 	ShaderProgram::LoadProgram(vertexSource, fragmentSource);
 }
 
+
 void EntityShader::GetAllUniformLocation() {
+	CameraShaderProgram::GetAllUniformLocation();
 	m_LocationColorEffect = static_cast<unsigned int>(GetUniformLocation("ColorEffect"));
-	m_LocationViewMatrix = static_cast<unsigned int>(GetUniformLocation("viewMatrix"));
 	m_LocationPosition = static_cast<unsigned int>(GetUniformLocation("modelPosition"));
-	m_LocationProjectionMatrix = static_cast<unsigned int>(GetUniformLocation("projectionMatrix"));
 }
 
 void EntityShader::SetColorEffect(const Vec3f& color) {
 	LoadVector(m_LocationColorEffect, color);
 }
 
-void EntityShader::SetProjectionMatrix(const Mat4f& proj) const {
-	LoadMat4(m_LocationProjectionMatrix, proj);
-}
-
-void EntityShader::SetViewMatrix(const Mat4f& view) const {
-	LoadMat4(m_LocationViewMatrix, view);
-}
-
 void EntityShader::SetModelPos(const Vec3f& pos) const {
 	LoadVector(m_LocationPosition, pos);
 }