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

Corection of the texture 3D and update windows makefile who does not support shader directly

Browse Source
This commit is contained in:
Edouard DUPIN 2012-08-30 16:58:54 +02:00
parent cc6d40f9d6
commit 6d488cb802
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build

@ -1 +1 @@
Subproject commit c756ceacf5a758f882263bb5f0fbd755373f00b6 Subproject commit 69605919a97aa8ccf82eef24b15f960f9c8ba7af

2
Sources/libewol/ewol/oObject/3DTextured.cpp
View File

@ -110,7 +110,7 @@ void ewol::OObject3DTextured::Draw(void)
#endif #endif
} }
void ewol::OObject2DTextured::Clear(void) void ewol::OObject3DTextured::Clear(void)
{ {
m_coord.Clear(); m_coord.Clear();
m_coordTex.Clear(); m_coordTex.Clear();

4
share/textured3D.vert
View File

@ -3,7 +3,7 @@ precision mediump float;
precision mediump int; precision mediump int;
#endif #endif
// Input : // Input :
attribute vec2 EW_coord3d; attribute vec3 EW_coord3d;
attribute vec2 EW_texture2d; attribute vec2 EW_texture2d;
attribute vec4 EW_color; attribute vec4 EW_color;
uniform mat4 EW_MatrixTransformation; uniform mat4 EW_MatrixTransformation;
@ -13,7 +13,7 @@ varying vec4 f_color;
varying vec2 f_texcoord; varying vec2 f_texcoord;
void main(void) { void main(void) {
gl_Position = EW_MatrixTransformation * vec4(EW_coord2d, 0.0, 1.0); gl_Position = EW_MatrixTransformation * vec4(EW_coord3d, 1.0);
//gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * vec4(EW_coord3d, 1.0); //gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * vec4(EW_coord3d, 1.0);
// set texture output coord // set texture output coord
f_texcoord = EW_texture2d; f_texcoord = EW_texture2d;