aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin/graphics')
-rw-r--r--src/libjin/graphics/fonts/je_texture_font.cpp3
-rw-r--r--src/libjin/graphics/fonts/je_ttf.cpp3
-rw-r--r--src/libjin/graphics/je_gl.cpp1
-rw-r--r--src/libjin/graphics/je_graphic.cpp22
-rw-r--r--src/libjin/graphics/je_mesh.cpp7
-rw-r--r--src/libjin/graphics/je_shapes.cpp54
-rw-r--r--src/libjin/graphics/shaders/je_jsl_compiler.cpp10
-rw-r--r--src/libjin/graphics/shaders/je_jsl_compiler.h1
-rw-r--r--src/libjin/graphics/shaders/je_shader.cpp24
-rw-r--r--src/libjin/graphics/shaders/je_shader.h15
10 files changed, 63 insertions, 77 deletions
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/je_texture_font.cpp
index 97f1f2f..bd1b061 100644
--- a/src/libjin/graphics/fonts/je_texture_font.cpp
+++ b/src/libjin/graphics/fonts/je_texture_font.cpp
@@ -276,15 +276,14 @@ namespace JinEngine
const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0);
+ shader->prepare();
shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
for (int i = 0; i < glyphinfolist.size(); ++i)
{
const GlyphArrayDrawInfo& info = glyphinfolist[i];
- shader->beginUploadAttributes();
shader->uploadVertices(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x);
shader->uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
- shader->endUploadAttributes();
gl.bindTexture(info.texture);
gl.drawArrays(GL_QUADS, 0, info.count);
gl.bindTexture(0);
diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp
index 5d341fa..0e9f672 100644
--- a/src/libjin/graphics/fonts/je_ttf.cpp
+++ b/src/libjin/graphics/fonts/je_ttf.cpp
@@ -295,15 +295,14 @@ namespace JinEngine
const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0);
+ shader->prepare();
shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
for (int i = 0; i < glyphinfolist.size(); ++i)
{
const GlyphArrayDrawInfo& info = glyphinfolist[i];
- shader->beginUploadAttributes();
shader->uploadVertices(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x);
shader->uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
- shader->endUploadAttributes();
gl.bindTexture(info.texture);
gl.drawArrays(GL_QUADS, 0, info.count);
gl.bindTexture(0);
diff --git a/src/libjin/graphics/je_gl.cpp b/src/libjin/graphics/je_gl.cpp
index 41fdf76..7ef4ee0 100644
--- a/src/libjin/graphics/je_gl.cpp
+++ b/src/libjin/graphics/je_gl.cpp
@@ -281,7 +281,6 @@ namespace JinEngine
if (shader)
{
glUseProgram(shader->getGLProgramID());
- shader->setDefaultUniform();
mShader = shader;
}
}
diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/je_graphic.cpp
index 964d0e5..96c3b4a 100644
--- a/src/libjin/graphics/je_graphic.cpp
+++ b/src/libjin/graphics/je_graphic.cpp
@@ -71,12 +71,11 @@ namespace JinEngine
textureCoords[6] = 1; textureCoords[7] = 0;
// Set shader.
Shader* shader = gl.getShader();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix);
- shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
- shader->beginUploadAttributes();
- shader->uploadVertices(2, GL_FLOAT, 0, vertexCoords);
- shader->uploadUV(2, GL_FLOAT, 0, textureCoords);
- shader->endUploadAttributes();
+ shader->prepare()
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix)
+ .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix())
+ .uploadVertices(2, GL_FLOAT, 0, vertexCoords)
+ .uploadUV(2, GL_FLOAT, 0, textureCoords);
gl.bindTexture(getGLTexture());
gl.drawArrays(GL_QUADS, 0, 4);
@@ -106,12 +105,11 @@ namespace JinEngine
Math::Matrix modelViewMatrix = gl.getModelViewMatrix(x, y, sx, sy, r, ax, ay);
Shader* shader = gl.getShader();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix);
- shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
- shader->beginUploadAttributes();
- shader->uploadVertices(2, GL_FLOAT, 0, vertexCoords);
- shader->uploadUV(2, GL_FLOAT, 0, textureCoords);
- shader->endUploadAttributes();
+ shader->prepare()
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix)
+ .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix())
+ .uploadVertices(2, GL_FLOAT, 0, vertexCoords)
+ .uploadUV(2, GL_FLOAT, 0, textureCoords);
gl.bindTexture(getGLTexture());
gl.drawArrays(GL_QUADS, 0, 4);
diff --git a/src/libjin/graphics/je_mesh.cpp b/src/libjin/graphics/je_mesh.cpp
index 7a409b4..e8512ac 100644
--- a/src/libjin/graphics/je_mesh.cpp
+++ b/src/libjin/graphics/je_mesh.cpp
@@ -60,13 +60,12 @@ namespace JinEngine
Math::Matrix modelViewMatrix = gl.getModelViewMatrix(x, y, sx, sy, r, ox, oy);
Shader* shader = gl.getShader();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix)
+ shader->prepare()
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelViewMatrix)
.sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix())
- .beginUploadAttributes()
.uploadVertices(2, GL_FLOAT, sizeof(Vertex), &(mVertices[0].xy))
.uploadUV(2, GL_FLOAT, sizeof(Vertex), &(mVertices[0].uv))
- .uploadColor(4, GL_UNSIGNED_BYTE, sizeof(Vertex), &(mVertices[0].color), GL_TRUE)
- .endUploadAttributes();
+ .uploadColor(4, GL_UNSIGNED_BYTE, sizeof(Vertex), &(mVertices[0].color), GL_TRUE);
gl.bindTexture(mGraphic->getGLTexture());
gl.drawArrays(GL_POLYGON, 0, mVertices.size());
diff --git a/src/libjin/graphics/je_shapes.cpp b/src/libjin/graphics/je_shapes.cpp
index 9af031d..7781b3f 100644
--- a/src/libjin/graphics/je_shapes.cpp
+++ b/src/libjin/graphics/je_shapes.cpp
@@ -22,26 +22,26 @@ namespace JinEngine
{
float verts[] = { x + 0.5f , y + 0.5f };
- Shader* shader = gl.getShader();
- shader->beginUploadAttributes();
- shader->uploadVertices(2, GL_FLOAT, 0, verts);
- shader->endUploadAttributes();
Matrix modelMatrix = gl.getModelViewMatrix();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
- shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
+
+ Shader* shader = gl.getShader();
+ shader->prepare()
+ .uploadVertices(2, GL_FLOAT, 0, verts)
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
+ .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
glDrawArrays(GL_POINTS, 0, 1);
}
void points(int n, GLshort* p)
{
- Shader* shader = gl.getShader();
- shader->beginUploadAttributes();
- shader->uploadVertices(2, GL_SHORT, 0, p);
- shader->endUploadAttributes();
Matrix modelMatrix = gl.getModelViewMatrix();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
- shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
+
+ Shader* shader = gl.getShader();
+ shader->prepare()
+ .uploadVertices(2, GL_SHORT, 0, p)
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
+ .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
glDrawArrays(GL_POINTS, 0, n);
}
@@ -52,14 +52,14 @@ namespace JinEngine
x1 + 0.5f, y1 + 0.5f,
x2 + 0.5f, y2 + 0.5f
};
+
+ Matrix modelMatrix = gl.getModelViewMatrix();
Shader* shader = gl.getShader();
- shader->beginUploadAttributes();
- shader->uploadVertices(2, GL_FLOAT, 0, verts);
- shader->endUploadAttributes();
- Matrix modelMatrix = gl.getModelViewMatrix();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
- shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
+ shader->prepare()
+ .uploadVertices(2, GL_FLOAT, 0, verts)
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
+ .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
glDrawArrays(GL_LINES, 0, 2);
}
@@ -105,11 +105,10 @@ namespace JinEngine
{
Shader* shader = gl.getShader();
Matrix modelMatrix = gl.getModelViewMatrix();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
- shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
- shader->beginUploadAttributes();
- shader->uploadVertices(2, GL_FLOAT, 0, p);
- shader->endUploadAttributes();
+ shader->prepare()
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
+ .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix())
+ .uploadVertices(2, GL_FLOAT, 0, p);
glDrawArrays(GL_LINE_LOOP, 0, count);
}
@@ -124,11 +123,10 @@ namespace JinEngine
{
Shader* shader = gl.getShader();
Matrix modelMatrix = gl.getModelViewMatrix();
- shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
- shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
- shader->beginUploadAttributes();
- shader->uploadVertices(2, GL_FLOAT, 0, p);
- shader->endUploadAttributes();
+ shader->prepare()
+ .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
+ .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix())
+ .uploadVertices(2, GL_FLOAT, 0, p);
glDrawArrays(GL_POLYGON, 0, count);
}
diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.cpp b/src/libjin/graphics/shaders/je_jsl_compiler.cpp
index d081c51..8aacdd0 100644
--- a/src/libjin/graphics/shaders/je_jsl_compiler.cpp
+++ b/src/libjin/graphics/shaders/je_jsl_compiler.cpp
@@ -20,7 +20,8 @@ namespace JinEngine
/// Built-in variables in vertex shader:
/// jin_ProjectionMatrix --+
/// jin_ModelViewMatrix |- Uniforms
- /// jin_MainTexture --+
+ /// jin_MainTexture |
+ /// jin_Time --+
/// jin_VertexCoords --+
/// jin_TextureCoords |- Attributes
/// jin_VertexColor --+
@@ -29,7 +30,8 @@ namespace JinEngine
/// Built-in variables in fragment shader:
/// jin_ProjectionMatrix --+
/// jin_ModelViewMatrix |- Uniforms
- /// jin_MainTexture --+
+ /// jin_MainTexture |
+ /// jin_Time --+
/// jin_Color --+
/// jin_XY |- Inputs
/// jin_UV |
@@ -42,6 +44,7 @@ namespace JinEngine
JinEngine::String SHADER_VERTEX_COORDS = "jin_VertexCoords";
JinEngine::String SHADER_TEXTURE_COORDS = "jin_TextureCoords";
JinEngine::String SHADER_VERTEX_COLOR = "jin_VertexColor";
+ JinEngine::String SHADER_TIME = "jin_Time";
JinEngine::String SHADER_VERSION = "#version 130 core \n";
JinEngine::String SHADER_DEFINITIONS =
// Types
@@ -65,7 +68,8 @@ namespace JinEngine
JinEngine::String SHADER_UNIFORMS =
"uniform Texture " + SHADER_MAIN_TEXTURE + "; \n"
"uniform mat4 " + SHADER_PROJECTION_MATRIX + "; \n"
- "uniform mat4 " + SHADER_MODELVIEW_MATRIX + "; \n";
+ "uniform mat4 " + SHADER_MODELVIEW_MATRIX + "; \n"
+ "uniform vec2 " + SHADER_TIME + "; \n";
JinEngine::String JSLCompiler::formatVertexShader(const JinEngine::String& vert)
{
diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.h b/src/libjin/graphics/shaders/je_jsl_compiler.h
index c34f8ec..75c92cf 100644
--- a/src/libjin/graphics/shaders/je_jsl_compiler.h
+++ b/src/libjin/graphics/shaders/je_jsl_compiler.h
@@ -22,6 +22,7 @@ namespace JinEngine
extern JinEngine::String SHADER_VERTEX_COORDS;
extern JinEngine::String SHADER_TEXTURE_COORDS;
extern JinEngine::String SHADER_VERTEX_COLOR;
+ extern JinEngine::String SHADER_TIME;
///
/// Compile JSL into GLSL.
diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp
index 0137978..5668168 100644
--- a/src/libjin/graphics/shaders/je_shader.cpp
+++ b/src/libjin/graphics/shaders/je_shader.cpp
@@ -3,6 +3,7 @@
#include <iostream>
+#include "../../time/je_timer.h"
#include "../../filesystem/je_buffer.h"
#include "../../utils/je_macros.h"
@@ -13,6 +14,7 @@
using namespace std;
using namespace JinEngine::Filesystem;
+using namespace JinEngine::Time;
namespace JinEngine
{
@@ -71,9 +73,14 @@ namespace JinEngine
glDeleteShader(mPID);
}
- void Shader::setDefaultUniform()
+ Shader& Shader::prepare()
{
+ // Send uniforms.
sendInt(SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT);
+ sendVec2(SHADER_TIME, Time::getSecond(), Time::getDeltaTime());
+ // Reset attribute index.
+ mAttributeIndex = 0;
+ return *this;
}
bool Shader::compile(const string& program)
@@ -86,7 +93,7 @@ namespace JinEngine
return false;
}
- #define glsl(SHADER_MODE, SHADER, SRC) \
+ #define glsl(SHADER_MODE, SHADER, SRC) \
do{ \
const GLchar* src = SRC.c_str(); \
glShaderSource(SHADER, 1, &src, NULL); \
@@ -103,6 +110,7 @@ namespace JinEngine
// Compile fragment shader.
GLuint fid = glCreateShader(GL_FRAGMENT_SHADER);
glsl(GL_FRAGMENT_SHADER, fid, fragment_shader);
+
#undef glsl
// Create OpenGL shader program.
mPID = glCreateProgram();
@@ -269,18 +277,6 @@ namespace JinEngine
return *this;
}
- Shader& Shader::beginUploadAttributes()
- {
- mAttributeIndex = 0;
- return *this;
- }
-
- Shader& Shader::endUploadAttributes()
- {
- mAttributeIndex = 0;
- return *this;
- }
-
Shader& Shader::uploadAttribute(const String& name, int n, GLenum type, GLsizei stride, const GLvoid * pointers, GLboolean normalized)
{
GLint loc = glGetAttribLocation(mPID, name);
diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h
index 92e1c4c..a279a79 100644
--- a/src/libjin/graphics/shaders/je_shader.h
+++ b/src/libjin/graphics/shaders/je_shader.h
@@ -44,7 +44,10 @@ namespace JinEngine
///
virtual ~Shader();
- void setDefaultUniform();
+ ///
+ /// Prepare shader and set default uniforms.
+ ///
+ Shader& prepare();
///
/// Send float value to shader.
@@ -155,16 +158,6 @@ namespace JinEngine
Shader& uploadAttribute(const String& name, int n, GLenum type, GLsizei stride, const GLvoid * pointers, GLboolean normalized = GL_FALSE);
///
- /// Reset attribute index.
- ///
- Shader& beginUploadAttributes();
-
- ///
- /// Reset attribute index.
- ///
- Shader& endUploadAttributes();
-
- ///
/// Program ID.
///
inline GLuint getGLProgramID() { return mPID; };
generated by cgit v1.1-26-g67d0 at 2025-05-29 12:04:19 +0000