diff options
Diffstat (limited to 'src/libjin/Graphics')
| -rw-r--r-- | src/libjin/Graphics/Drawable.h | 1 | ||||
| -rw-r--r-- | src/libjin/Graphics/JSL.cpp | 29 | ||||
| -rw-r--r-- | src/libjin/Graphics/Texture.h | 4 |
3 files changed, 18 insertions, 16 deletions
diff --git a/src/libjin/Graphics/Drawable.h b/src/libjin/Graphics/Drawable.h index e04ac6b..4e91adb 100644 --- a/src/libjin/Graphics/Drawable.h +++ b/src/libjin/Graphics/Drawable.h @@ -41,6 +41,7 @@ namespace graphics void setVertices(float* v, float* t); GLuint texture; + GLuint vbo; int width, height; diff --git a/src/libjin/Graphics/JSL.cpp b/src/libjin/Graphics/JSL.cpp index 2ab7ceb..fb6279a 100644 --- a/src/libjin/Graphics/JSL.cpp +++ b/src/libjin/Graphics/JSL.cpp @@ -7,20 +7,21 @@ namespace jin { namespace graphics { - //vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 screen_coords) - static const char* base_f = " " - //"#version 120 \n" - "#define number float \n" - "#define Image sampler2D \n" - "#define Canvas sampler2D \n" - "#define Color vec4 \n" - "#define Texel texture2D \n" - "#define extern uniform \n" - "uniform Image _tex0_; \n" - "%s \n" - "void main(){ \n" - " gl_FragColor = effect(gl_Color, _tex0_, gl_TexCoord[0].xy, gl_FragCoord.xy);\n" - "}\0"; + + static const char* base_f = R"base_f( +#define number float +#define Texture sampler2D +#define Canvas sampler2D +#define Color vec4 +#define Texel texture2D +#define extern uniform +uniform Texture _tex0_; +%s +void main() +{ + gl_FragColor = effect(gl_Color, _tex0_, gl_TexCoord[0].xy, gl_FragCoord.xy); +} + )base_f"; /*static*/ JSLProgram* JSLProgram::currentJSLProgram = nullptr; diff --git a/src/libjin/Graphics/Texture.h b/src/libjin/Graphics/Texture.h index 47f8d53..1e7a2f5 100644 --- a/src/libjin/Graphics/Texture.h +++ b/src/libjin/Graphics/Texture.h @@ -33,8 +33,8 @@ namespace graphics }; -} -} +} // graphics +} // jin #endif // JIN_MODULES_RENDER #endif // __JIN_IMAGE_H
\ No newline at end of file |