Browse Source

shader improve

dmuratshin 8 years ago
parent
commit
e2f9706dc0
2 changed files with 8 additions and 2 deletions
  1. 2 2
      oxygine/system_data/build.py
  2. 6 0
      oxygine/system_data/original/system/shader.glsl

+ 2 - 2
oxygine/system_data/build.py

@@ -45,9 +45,9 @@ def gen(module, data):
     return (fmtH % args, fmtCPP % args, )
     return (fmtH % args, fmtCPP % args, )
     
     
 rs = gen("system", data.getvalue())
 rs = gen("system", data.getvalue())
-with open("../../oxygine/src/core/system_data.h", "w") as fh:
+with open("../../oxygine/src/oxygine/core/system_data.h", "w") as fh:
     fh.write(rs[0])
     fh.write(rs[0])
-with open("../../oxygine/src/core/system_data.cpp", "w") as fh:
+with open("../../oxygine/src/oxygine/core/system_data.cpp", "w") as fh:
     fh.write(rs[1])
     fh.write(rs[1])
 
 
 with open("system.zip", "wb") as zp:
 with open("system.zip", "wb") as zp:

+ 6 - 0
oxygine/system_data/original/system/shader.glsl

@@ -43,6 +43,12 @@ uniform lowp sampler2D alpha_texture;
 #define DONT_MULT_BY_RESULT_COLOR
 #define DONT_MULT_BY_RESULT_COLOR
 #endif
 #endif
 
 
+
+lowp vec4 modify_base_pre(lowp vec4);
+lowp vec4 modify_base(lowp vec4);
+lowp vec4 replaced_get_base();
+lowp vec4 replaced_get_color();
+
 lowp vec4 get_base()
 lowp vec4 get_base()
 {
 {
 	lowp vec4 base = texture2D(base_texture, result_uv);	
 	lowp vec4 base = texture2D(base_texture, result_uv);