diff options
Diffstat (limited to 'src/libjin')
| -rw-r--r-- | src/libjin/Game/je_entity.h | 8 | ||||
| -rw-r--r-- | src/libjin/Game/je_gameobject.cpp (renamed from src/libjin/Game/je_game_object.cpp) | 0 | ||||
| -rw-r--r-- | src/libjin/Game/je_gameobject.h (renamed from src/libjin/Game/je_game_object.h) | 0 | ||||
| -rw-r--r-- | src/libjin/Graphics/je_graphic_single.cpp | 31 | ||||
| -rw-r--r-- | src/libjin/Graphics/je_graphic_single.h | 2 | ||||
| -rw-r--r-- | src/libjin/Graphics/particle/je_particle_system.h | 2 |
6 files changed, 23 insertions, 20 deletions
diff --git a/src/libjin/Game/je_entity.h b/src/libjin/Game/je_entity.h index cf4eeb0..92976b4 100644 --- a/src/libjin/Game/je_entity.h +++ b/src/libjin/Game/je_entity.h @@ -1,7 +1,7 @@ #ifndef __JE_ENTITY_H #define __JE_ENTITY_H -#include "je_game_object.h" +#include "je_gameobject.h" namespace JinEngine { @@ -14,12 +14,14 @@ namespace JinEngine class Entity : public GameObject { public: + Entity(); private: + }; - } -} + } // namespace Game +} // namespace JinEngine #endif
\ No newline at end of file diff --git a/src/libjin/Game/je_game_object.cpp b/src/libjin/Game/je_gameobject.cpp index 1396518..1396518 100644 --- a/src/libjin/Game/je_game_object.cpp +++ b/src/libjin/Game/je_gameobject.cpp diff --git a/src/libjin/Game/je_game_object.h b/src/libjin/Game/je_gameobject.h index 08a103f..08a103f 100644 --- a/src/libjin/Game/je_game_object.h +++ b/src/libjin/Game/je_gameobject.h diff --git a/src/libjin/Graphics/je_graphic_single.cpp b/src/libjin/Graphics/je_graphic_single.cpp index 0784409..96eb1af 100644 --- a/src/libjin/Graphics/je_graphic_single.cpp +++ b/src/libjin/Graphics/je_graphic_single.cpp @@ -47,30 +47,31 @@ namespace JinEngine void GraphicSingle::render(const Math::Quad& slice, int x, int y, float sx, float sy, float r, float ax, float ay) { - float vertCoords[8] = { - 0, 0, - 0, slice.h, - slice.w, slice.h, - slice.w, 0 - }; + static float vertexCoords[8]; + static float textureCoords[8]; + + // Set vertex coordinates. + vertexCoords[0] = 0; vertexCoords[1] = 0; + vertexCoords[2] = 0; vertexCoords[3] = slice.h; + vertexCoords[4] = slice.w; vertexCoords[5] = slice.h; + vertexCoords[6] = slice.w; vertexCoords[7] = 0; + // Set texture coordinates. float slx = slice.x / mSize.w; float sly = slice.y / mSize.h; float slw = slice.w / mSize.w; float slh = slice.h / mSize.h; - float texCoords[8] = { - slx, sly, - slx, sly + slh, - slx + slw, sly + slh, - slx + slw, sly - }; + textureCoords[0] = slx; textureCoords[1] = sly; + textureCoords[2] = slx; textureCoords[3] = sly + slh; + textureCoords[4] = slx + slw; textureCoords[5] = sly + slh; + textureCoords[6] = slx + slw; textureCoords[7] = sly; gl.ModelMatrix.setTransformation(x, y, r, sx, sy, ax, ay); Shader* shader = Shader::getCurrentShader(); shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix); - shader->bindVertexPointer(2, GL_FLOAT, 0, vertCoords); - shader->bindUVPointer(2, GL_FLOAT, 0, texCoords); + shader->bindVertexPointer(2, GL_FLOAT, 0, vertexCoords); + shader->bindUVPointer(2, GL_FLOAT, 0, textureCoords); gl.bindTexture(getGLTexture()); gl.drawArrays(GL_QUADS, 0, 4); @@ -78,4 +79,4 @@ namespace JinEngine } } // namespace Graphics -} // namespace JinEngine
\ No newline at end of file +} // namespace JinEngine
\ No newline at end of file diff --git a/src/libjin/Graphics/je_graphic_single.h b/src/libjin/Graphics/je_graphic_single.h index ca2864b..f61234b 100644 --- a/src/libjin/Graphics/je_graphic_single.h +++ b/src/libjin/Graphics/je_graphic_single.h @@ -50,4 +50,4 @@ namespace JinEngine } // namespace Graphics } // namespace JinEngine -#endif
\ No newline at end of file +#endif
\ No newline at end of file diff --git a/src/libjin/Graphics/particle/je_particle_system.h b/src/libjin/Graphics/particle/je_particle_system.h index 270d9a8..8526da8 100644 --- a/src/libjin/Graphics/particle/je_particle_system.h +++ b/src/libjin/Graphics/particle/je_particle_system.h @@ -4,7 +4,7 @@ #include <vector> #include "../../common/je_temporary.h" -#include "../../game/je_game_object.h" +#include "../../game/je_gameobject.h" #include "../je_sprite.h" |