Merge pull request #700 from Snoroz/master

Added support for Mesh class colors parameter

ursina/shaders/instancing_shader.py

@@ -1,58 +1,57 @@
-from ursina import Shader, Vec2, Vec3, Vec4, Quat; instancing_shader=Shader(name='instancing_shader', language=Shader.GLSL, vertex='''#version 140
+from ursina import Shader, Vec2, Vec3, Vec4, Quat; instancing_shader = Shader(name='instancing_shader', language=Shader.GLSL, vertex='''#version 140
 
 uniform mat4 p3d_ModelViewProjectionMatrix;
 in vec4 p3d_Vertex;
 in vec2 p3d_MultiTexCoord0;
+in vec4 p3d_Color;
 out vec2 texcoords;
+out vec4 vertex_color;
 uniform vec2 texture_scale;
 uniform vec2 texture_offset;
 
 uniform vec3 position_offsets[256];
 uniform vec4 rotation_offsets[256];
 uniform vec3 scale_multipliers[256];
 
-
 void main() {
     vec3 v = p3d_Vertex.xyz * scale_multipliers[gl_InstanceID];
     vec4 q = rotation_offsets[gl_InstanceID];
     v = v + 2.0 * cross(q.xyz, cross(q.xyz, v) + q.w * v);
 
     gl_Position = p3d_ModelViewProjectionMatrix * (vec4(v + position_offsets[gl_InstanceID], 1.));
     texcoords = (p3d_MultiTexCoord0 * texture_scale) + texture_offset;
+    vertex_color = p3d_Color;
 }
 ''',
 
-fragment='''
-#version 140
+fragment='''#version 140
 
 uniform sampler2D p3d_Texture0;
 uniform vec4 p3d_ColorScale;
 in vec2 texcoords;
+in vec4 vertex_color;
 out vec4 fragColor;
 
-
-
 void main() {
-    vec4 color = texture(p3d_Texture0, texcoords) * p3d_ColorScale;
+    vec4 color = texture(p3d_Texture0, texcoords) * p3d_ColorScale * vertex_color;
     fragColor = color.rgba;
 }
-
 ''',
+
 default_input={
-    'texture_scale' : Vec2(1,1),
-    'texture_offset' : Vec2(0.0, 0.0),
-    'position_offsets' : [Vec3(i,0,0) for i in range(256)],
-    'rotation_offsets' : [Vec4(0) for i in range(256)],
-    'scale_multipliers' : [Vec3(1) for i in range(256)],
+    'texture_scale': Vec2(1, 1),
+    'texture_offset': Vec2(0.0, 0.0),
+    'position_offsets': [Vec3(i, 0, 0) for i in range(256)],
+    'rotation_offsets': [Vec4(0) for i in range(256)],
+    'scale_multipliers': [Vec3(1) for i in range(256)],
 }
 )
 
-
-
 if __name__ == '__main__':
-    from ursina import Ursina, Entity, EditorCamera, Vec3, color, application, time, Cone
+    from ursina import Ursina, window, Entity, EditorCamera, Vec3, color, application, time, Cone
     import random
-    app = Ursina(vsync=False)
+    window.vsync = False
+    app = Ursina()
 
     instances = []
     Entity(model='plane', texture='grass', scale=128)
@@ -65,13 +64,14 @@
 
     for z in range(16):
         for x in range(16):
-            e = Entity(position=Vec3(x, 0, z), color=color.lime, rotation_y=random.random()*360)
+            e = Entity(add_to_scene_entities=False, position=Vec3(x, 0, z), color=color.lime, rotation_y=random.random()*360)
             instances.append(e)
             print(e.quaternion, Quat())
 
     p.set_shader_input('position_offsets', [e.position*4 for e in instances])
     p.set_shader_input('rotation_offsets', [e.quaternion for e in instances])
     p.set_shader_input('scale_multipliers',[e.scale*random.uniform(.9,2) for e in instances])
+    p.set_shader_input('colors', p.model.colors)
 
     print(len(p.model.vertices) * len(instances))
     EditorCamera()