From 6d488cb802f9d55ae0b1a9e25871e1d635d23e6e Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 30 Aug 2012 16:58:54 +0200 Subject: [PATCH] Corection of the texture 3D and update windows makefile who does not support shader directly --- Build | 2 +- Sources/libewol/ewol/oObject/3DTextured.cpp | 2 +- share/textured3D.vert | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Build b/Build index c756ceac..69605919 160000 --- a/Build +++ b/Build @@ -1 +1 @@ -Subproject commit c756ceacf5a758f882263bb5f0fbd755373f00b6 +Subproject commit 69605919a97aa8ccf82eef24b15f960f9c8ba7af diff --git a/Sources/libewol/ewol/oObject/3DTextured.cpp b/Sources/libewol/ewol/oObject/3DTextured.cpp index 4f6cc061..d2460391 100644 --- a/Sources/libewol/ewol/oObject/3DTextured.cpp +++ b/Sources/libewol/ewol/oObject/3DTextured.cpp @@ -110,7 +110,7 @@ void ewol::OObject3DTextured::Draw(void) #endif } -void ewol::OObject2DTextured::Clear(void) +void ewol::OObject3DTextured::Clear(void) { m_coord.Clear(); m_coordTex.Clear(); diff --git a/share/textured3D.vert b/share/textured3D.vert index 4ffa95d7..ecabb7b8 100644 --- a/share/textured3D.vert +++ b/share/textured3D.vert @@ -3,7 +3,7 @@ precision mediump float; precision mediump int; #endif // Input : -attribute vec2 EW_coord3d; +attribute vec3 EW_coord3d; attribute vec2 EW_texture2d; attribute vec4 EW_color; uniform mat4 EW_MatrixTransformation; @@ -13,7 +13,7 @@ varying vec4 f_color; varying vec2 f_texcoord; 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); // set texture output coord f_texcoord = EW_texture2d;