Merge pull request #553 from redcamel/dev

-
redcamel · Mar 4, 2019 · 8f7b18b · 8f7b18b
2 parents f409c54 + dc4226a
commit 8f7b18b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 18 deletions.
diff --git a/release/RedGL.js b/release/RedGL.js
@@ -9397,21 +9397,30 @@ var RedTextMaterial;
                 // position 계산
                 mat4 targetMatrix;
                 if(uOrthographicYn){
-                    targetMatrix = uMMatrix;
+                      targetMatrix = uMMatrix * mat4(
+                        u_width, 0.0, 0.0, 0.0,
+                        0.0, u_height, 0.0, 0.0,
+                        0.0, 0.0, 1.0, 0.0,
+                        0.0, 0.0, 0.0, 1.0
+                    ) ;
+                gl_Position = uPMatrix * uCameraMatrix * targetMatrix *  vec4(aVertexPosition, 1.0);
+
+
                 }else{
                     targetMatrix = uMMatrix * mat4(
                         u_width/uResolution.y, 0.0, 0.0, 0.0,
                         0.0, u_height/uResolution.y, 0.0, 0.0,
                         0.0, 0.0, 1.0, 0.0,
                         0.0, 0.0, 0.0, 1.0
                     ) ;
+                    //#REDGL_DEFINE#sprite3D#true# gl_Position = uPMatrix * getSprite3DMatrix(uCameraMatrix , targetMatrix) *  vec4(aVertexPosition, 1.0);
+                    //#REDGL_DEFINE#sprite3D#true# if(!u_PerspectiveScale){
+                    //#REDGL_DEFINE#sprite3D#true#   gl_Position /= gl_Position.w;
+                    //#REDGL_DEFINE#sprite3D#true#   gl_Position.xy += aVertexPosition.xy * vec2((uPMatrix * targetMatrix)[0][0],(uPMatrix * targetMatrix)[1][1]);
+                    //#REDGL_DEFINE#sprite3D#true# }
+                    //#REDGL_DEFINE#sprite3D#false# gl_Position = uPMatrix * uCameraMatrix * targetMatrix *  vec4(aVertexPosition, 1.0);
                 }
-                //#REDGL_DEFINE#sprite3D#true# gl_Position = uPMatrix * getSprite3DMatrix(uCameraMatrix , targetMatrix) *  vec4(aVertexPosition, 1.0);
-                //#REDGL_DEFINE#sprite3D#true# if(!u_PerspectiveScale){
-                //#REDGL_DEFINE#sprite3D#true#   gl_Position /= gl_Position.w;
-                //#REDGL_DEFINE#sprite3D#true#   gl_Position.xy += aVertexPosition.xy * vec2((uPMatrix * targetMatrix)[0][0],(uPMatrix * targetMatrix)[1][1]);
-                //#REDGL_DEFINE#sprite3D#true# }
-                //#REDGL_DEFINE#sprite3D#false# gl_Position = uPMatrix * uCameraMatrix * targetMatrix *  vec4(aVertexPosition, 1.0);
+
 
                 //#REDGL_DEFINE#directionalShadow#true# vResolution = uResolution;
                 //#REDGL_DEFINE#directionalShadow#true# vShadowPos = cTexUnitConverter  *  uDirectionalShadowLightMatrix * targetMatrix * vec4(aVertexPosition, 1.0);
@@ -24003,4 +24012,4 @@ var RedGLOffScreen;
         }
         RedWorkerCode = RedWorkerCode.toString().replace(/^function ?. ?\) ?\{|\}\;?$/g, '');
     })();
-})();var RedGL_VERSION = {version : 'RedGL Release. last update( 2019-02-28 19:57:46)' };console.log(RedGL_VERSION);
+})();var RedGL_VERSION = {version : 'RedGL Release. last update( 2019-03-04 09:33:56)' };console.log(RedGL_VERSION);
diff --git a/release/RedGL.min.js b/release/RedGL.min.js
diff --git a/src/material/system/RedTextMaterial.js b/src/material/system/RedTextMaterial.js
@@ -27,21 +27,28 @@ var RedTextMaterial;
                 // position 계산
                 mat4 targetMatrix;
                 if(uOrthographicYn){
-                    targetMatrix = uMMatrix;
+                      targetMatrix = uMMatrix * mat4(
+                        u_width, 0.0, 0.0, 0.0,
+                        0.0, u_height, 0.0, 0.0,
+                        0.0, 0.0, 1.0, 0.0,
+                        0.0, 0.0, 0.0, 1.0
+                    ) ;
+                    gl_Position = uPMatrix * uCameraMatrix * targetMatrix *  vec4(aVertexPosition, 1.0);
                 }else{
                     targetMatrix = uMMatrix * mat4(
                         u_width/uResolution.y, 0.0, 0.0, 0.0,
                         0.0, u_height/uResolution.y, 0.0, 0.0,
                         0.0, 0.0, 1.0, 0.0,
                         0.0, 0.0, 0.0, 1.0
                     ) ;
+                    //#REDGL_DEFINE#sprite3D#true# gl_Position = uPMatrix * getSprite3DMatrix(uCameraMatrix , targetMatrix) *  vec4(aVertexPosition, 1.0);
+                    //#REDGL_DEFINE#sprite3D#true# if(!u_PerspectiveScale){
+                    //#REDGL_DEFINE#sprite3D#true#   gl_Position /= gl_Position.w;
+                    //#REDGL_DEFINE#sprite3D#true#   gl_Position.xy += aVertexPosition.xy * vec2((uPMatrix * targetMatrix)[0][0],(uPMatrix * targetMatrix)[1][1]);
+                    //#REDGL_DEFINE#sprite3D#true# }
+                    //#REDGL_DEFINE#sprite3D#false# gl_Position = uPMatrix * uCameraMatrix * targetMatrix *  vec4(aVertexPosition, 1.0);
                 }
-                //#REDGL_DEFINE#sprite3D#true# gl_Position = uPMatrix * getSprite3DMatrix(uCameraMatrix , targetMatrix) *  vec4(aVertexPosition, 1.0);
-                //#REDGL_DEFINE#sprite3D#true# if(!u_PerspectiveScale){
-                //#REDGL_DEFINE#sprite3D#true#   gl_Position /= gl_Position.w;
-                //#REDGL_DEFINE#sprite3D#true#   gl_Position.xy += aVertexPosition.xy * vec2((uPMatrix * targetMatrix)[0][0],(uPMatrix * targetMatrix)[1][1]);
-                //#REDGL_DEFINE#sprite3D#true# }
-                //#REDGL_DEFINE#sprite3D#false# gl_Position = uPMatrix * uCameraMatrix * targetMatrix *  vec4(aVertexPosition, 1.0);
+
 
                 //#REDGL_DEFINE#directionalShadow#true# vResolution = uResolution;
                 //#REDGL_DEFINE#directionalShadow#true# vShadowPos = cTexUnitConverter  *  uDirectionalShadowLightMatrix * targetMatrix * vec4(aVertexPosition, 1.0);