Testing doc script

This commit is contained in:
Anuken
2020-06-14 18:41:42 -04:00
parent 126b54b981
commit 5f79040faa
37 changed files with 59 additions and 30 deletions
+3 -3
View File
@@ -8,7 +8,7 @@ uniform float u_progress;
uniform float u_time;
varying vec4 v_color;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
bool id(vec2 coords, vec4 base){
@@ -26,10 +26,10 @@ bool cont(vec2 T, vec2 v){
void main() {
vec2 t = v_texCoord.xy;
vec2 t = v_texCoords.xy;
vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
vec2 coords = (v_texCoord-u_uv) / v;
vec2 coords = (v_texCoords-u_uv) / v;
float value = coords.x + coords.y;
vec4 color = texture2D(u_texture, t);
+2 -2
View File
@@ -5,12 +5,12 @@ attribute vec2 a_texCoord0;
attribute vec4 a_color;
varying vec4 v_color;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
uniform vec2 u_viewportInverse;
void main(){
gl_Position = u_projTrans * a_position;
v_texCoord = a_texCoord0;
v_texCoords = a_texCoord0;
v_color = a_color;
}
+2 -2
View File
@@ -3,9 +3,9 @@
uniform sampler2D u_texture;
varying vec4 v_color;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
void main(){
vec4 color = texture2D(u_texture, v_texCoord.xy);
vec4 color = texture2D(u_texture, v_texCoords.xy);
gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0 - color.r);
}
+2 -2
View File
@@ -2,9 +2,9 @@
uniform sampler2D u_texture;
uniform vec4 u_ambient;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
void main(){
vec4 color = texture2D(u_texture, v_texCoord);
vec4 color = texture2D(u_texture, v_texCoords);
gl_FragColor = clamp(vec4(mix(u_ambient.rgb, color.rgb, color.a), u_ambient.a - color.a), 0.0, 1.0);
}
+2 -2
View File
@@ -1,8 +1,8 @@
uniform sampler2D u_texture;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
void main(){
gl_FragColor = texture2D(u_texture, v_texCoord);
gl_FragColor = texture2D(u_texture, v_texCoords);
}
+2 -2
View File
@@ -1,9 +1,9 @@
attribute vec4 a_position;
attribute vec2 a_texCoord0;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
void main(){
v_texCoord = a_texCoord0;
v_texCoords = a_texCoord0;
gl_Position = a_position;
}
+2 -2
View File
@@ -13,10 +13,10 @@ uniform float u_dp;
uniform vec2 u_offset;
uniform vec4 u_shieldcolor;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
void main(){
vec2 T = v_texCoord.xy;
vec2 T = v_texCoords.xy;
vec2 coords = (T * u_texsize) + u_offset;
T += vec2(sin(coords.y / 3.0 + u_time / 20.0), sin(coords.x / 3.0 + u_time / 20.0)) / u_texsize;
+2 -2
View File
@@ -12,10 +12,10 @@ uniform vec2 u_campos;
uniform vec2 u_resolution;
uniform float u_time;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
void main(){
vec2 c = v_texCoord.xy;
vec2 c = v_texCoords.xy;
vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);
float btime = u_time / 4000.0;
+2 -2
View File
@@ -9,10 +9,10 @@ uniform vec2 u_campos;
uniform vec2 u_resolution;
uniform float u_time;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
void main(){
vec2 c = v_texCoord.xy;
vec2 c = v_texCoords.xy;
vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);
float btime = u_time / 8000.0;
+4 -4
View File
@@ -10,7 +10,7 @@ uniform vec2 u_uv2;
uniform vec2 u_texsize;
varying vec4 v_color;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
bool id(vec4 v){
return v.a > 0.1;
@@ -31,11 +31,11 @@ bool cont(vec2 T, vec2 v){
}
void main() {
vec2 coords = (v_texCoord.xy - u_uv) / (u_uv2 - u_uv);
vec2 t = v_texCoord.xy;
vec2 coords = (v_texCoords.xy - u_uv) / (u_uv2 - u_uv);
vec2 t = v_texCoords.xy;
vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
vec4 c = texture2D(u_texture, v_texCoord.xy);
vec4 c = texture2D(u_texture, v_texCoords.xy);
float alpha = c.a;
c.a *= u_progress;
+2 -2
View File
@@ -6,14 +6,14 @@ uniform vec2 u_campos;
uniform vec2 u_resolution;
uniform float u_time;
varying vec2 v_texCoord;
varying vec2 v_texCoords;
const float mscl = 40.0;
const float mth = 7.0;
void main(){
vec2 c = v_texCoord.xy;
vec2 c = v_texCoords.xy;
vec2 v = vec2(1.0/u_resolution.x, 1.0/u_resolution.y);
vec2 coords = vec2(c.x / v.x + u_campos.x, c.y / v.y + u_campos.y);
+4 -2
View File
@@ -287,7 +287,8 @@ public class Administration{
}
/**
* Makes a player an admin. Returns whether this player was already an admin.
* Makes a player an admin.
* @return whether this player was already an admin.
*/
public boolean adminPlayer(String id, String usid){
PlayerInfo info = getCreateInfo(id);
@@ -303,7 +304,8 @@ public class Administration{
}
/**
* Makes a player no longer an admin. Returns whether this player was an admin in the first place.
* Makes a player no longer an admin.
* @return whether this player was an admin in the first place.
*/
public boolean unAdminPlayer(String id){
PlayerInfo info = getCreateInfo(id);
@@ -46,7 +46,7 @@ public class LiquidModule extends BlockModule{
return smoothLiquid;
}
/** Returns total amount of liquids. */
/** @return total amount of liquids. */
public float total(){
return total;
}