mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-29 07:32:30 +00:00
Implements DrawRect in Canvas2D, removes CConsole background drawing with low level GL calls.
This was SVN commit r25590.
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
!!ARBfp1.0
|
||||
|
||||
TEMP colorTex;
|
||||
TEX colorTex, fragment.texcoord[0], texture[0], 2D;
|
||||
|
||||
PARAM colorAdd = program.local[1];
|
||||
PARAM colorMul = program.local[2];
|
||||
|
||||
TEMP color;
|
||||
MUL color, colorTex, colorMul;
|
||||
ADD color, color, colorAdd;
|
||||
|
||||
MOV result.color, color;
|
||||
|
||||
END
|
||||
@@ -0,0 +1,16 @@
|
||||
!!ARBvp1.0
|
||||
|
||||
PARAM transform[4] = { program.local[0..3] };
|
||||
|
||||
TEMP position;
|
||||
|
||||
DP4 position.x, transform[0], vertex.position;
|
||||
DP4 position.y, transform[1], vertex.position;
|
||||
MOV position.z, 0.0;
|
||||
MOV position.w, 1.0;
|
||||
|
||||
MOV result.position, position;
|
||||
|
||||
MOV result.texcoord[0], vertex.texcoord[0];
|
||||
|
||||
END
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<program type="arb">
|
||||
|
||||
<vertex file="arb/canvas2d.vp">
|
||||
<stream name="pos"/>
|
||||
<stream name="uv0"/>
|
||||
<uniform name="transform" loc="0" type="mat4"/>
|
||||
</vertex>
|
||||
|
||||
<fragment file="arb/canvas2d.fp">
|
||||
<uniform name="tex" loc="0" type="sampler2D"/>
|
||||
<uniform name="colorAdd" loc="1" type="vec4"/>
|
||||
<uniform name="colorMul" loc="2" type="vec4"/>
|
||||
</fragment>
|
||||
|
||||
</program>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<effect>
|
||||
|
||||
<technique>
|
||||
<require shaders="arb"/>
|
||||
<pass shader="arb/canvas2d"/>
|
||||
</technique>
|
||||
|
||||
<technique>
|
||||
<require shaders="glsl"/>
|
||||
<pass shader="glsl/canvas2d"/>
|
||||
</technique>
|
||||
|
||||
</effect>
|
||||
@@ -0,0 +1,12 @@
|
||||
#version 110
|
||||
|
||||
uniform vec4 colorAdd;
|
||||
uniform vec4 colorMul;
|
||||
uniform sampler2D tex;
|
||||
|
||||
varying vec2 v_uv;
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_FragColor = clamp(texture2D(tex, v_uv) * colorMul + colorAdd, 0.0, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
#version 110
|
||||
|
||||
uniform mat4 transform;
|
||||
|
||||
attribute vec2 a_vertex;
|
||||
attribute vec2 a_uv0;
|
||||
|
||||
varying vec2 v_uv;
|
||||
|
||||
void main()
|
||||
{
|
||||
v_uv = a_uv0;
|
||||
gl_Position = transform * vec4(a_vertex, 0.0, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<program type="glsl">
|
||||
|
||||
<vertex file="glsl/canvas2d.vs">
|
||||
<stream name="pos"/>
|
||||
<stream name="uv0"/>
|
||||
<attrib name="a_vertex" semantics="gl_Vertex"/>
|
||||
<attrib name="a_uv0" semantics="gl_MultiTexCoord0"/>
|
||||
</vertex>
|
||||
|
||||
<fragment file="glsl/canvas2d.fs"/>
|
||||
|
||||
</program>
|
||||
Reference in New Issue
Block a user