atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] update area

Browse Source
This commit is contained in:
Edouard DUPIN 2014-11-09 22:56:47 +01:00
parent 627584f13d
commit 1713685108
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/ege vendored

@ -1 +1 @@
Subproject commit eb762e5c93b8e20ac862b32879da7fb3e55b6fce
Subproject commit ca3ead0c8ce3c24b8e0be38bbad853383a695f8b

2
external/etk vendored

@ -1 +1 @@
Subproject commit ceab3d4d7d578d818aa7fba11e86fa3557f14d36
Subproject commit f04c3dd23829c63e383d0b4988198e6db2847539

2
sources/ewol/compositing/Area.cpp
View File

@ -61,7 +61,7 @@ void ewol::compositing::Area::draw(bool _disableDepthTest) {
// set Matrix : translation/positionMatrix
mat4 tmpMatrix = ewol::openGL::getMatrix()*m_matrixApply;
m_GLprogram->use();
m_GLprogram->uniformMatrix4fv(m_GLMatrix, 1, tmpMatrix.m_mat);
m_GLprogram->uniformMatrix4fv(m_GLMatrix, 1, tmpMatrix);
// TextureID
m_GLprogram->setTexture0(m_GLtexID, m_resource->getId());
// position :

2
sources/ewol/resource/Program.h
View File

@ -117,7 +117,7 @@ namespace ewol {
* @param[in] _pointer Pointer on the data that might be sended
* @param[in] _transpose Transpose the matrix (needed all the taime in the normal openGl access (only not done in the openGL-ES2 due to the fact we must done it ourself)
*/
void uniformMatrix4fv(int32_t _idElem, int32_t _nbElement, mat4 _pointer, bool _transpose=true);
void uniformMatrix4fv(int32_t _idElem, int32_t _nbElement, mat4 _matrix, bool _transpose=true);
inline void uniform(int32_t _idElem, const etk::Color<float>& _value) {
uniform4f(_idElem, _value.r(), _value.g(), _value.b(), _value.a());