Update shaders

mole99 · Jan 12, 2025 · f30b9da · f30b9da
1 parent 25e26b5
commit f30b9da
Show file tree

Hide file tree

Showing 23 changed files with 123 additions and 36 deletions.
diff --git a/sw/binary/test1.bit b/sw/binary/test1.bit
@@ -2,7 +2,7 @@
 00_0000_00 // SETRGB R0
 00_0100_01 // GETX R1
 00_0101_10 // GETY R2
-11_010000 // LDI 0x10
+00_0110_00 // GETTIME R0
 00_1000_01 // IFEQ R1
 00_0000_01 // SETRGB R1
 00_1000_10 // IFEQ R2

diff --git a/sw/binary/test10.bit b/sw/binary/test10.bit
@@ -0,0 +1,10 @@
+00_0100_00 // GETX R0
+00_0110_01 // GETTIME R1
+10_01_01_00 // ADD R0 R1
+00_1111_10 // SINE R2
+00_0101_00 // GETY R0
+00_0110_01 // GETTIME R1
+10_01_01_00 // ADD R0 R1
+00_1111_00 // SINE R0
+10_01_10_00 // ADD R0 R2
+00_0000_00 // SETRGB R0
diff --git a/sw/binary/test11.bit b/sw/binary/test11.bit
@@ -0,0 +1,10 @@
+00_1100_00 // DOUBLE R0
+00_0000_00 // SETRGB R0
+00_1110_11 // CLEAR R3
+00_1000_11 // IFEQ R3
+00_0110_00 // GETTIME R0
+01_00_00_00 // NOP
+01_00_00_00 // NOP
+01_00_00_00 // NOP
+01_00_00_00 // NOP
+01_00_00_00 // NOP
diff --git a/sw/binary/test12.bit b/sw/binary/test12.bit
@@ -0,0 +1,10 @@
+00_0100_00 // GETX R0
+00_1111_01 // SINE R1
+00_0101_00 // GETY R0
+00_1111_00 // SINE R0
+01_11_01_00 // XOR R0 R1
+00_0110_01 // GETTIME R1
+10_01_01_00 // ADD R0 R1
+00_0000_00 // SETRGB R0
+01_00_00_00 // NOP
+01_00_00_00 // NOP
diff --git a/sw/binary/test2.bit b/sw/binary/test2.bit
@@ -1,10 +1,10 @@
+00_0110_10 // GETTIME R2
 00_0100_00 // GETX R0
+10_01_10_00 // ADD R0 R2
 00_1111_01 // SINE R1
 00_0001_01 // SETR R1
 00_0101_00 // GETY R0
+10_01_10_00 // ADD R0 R2
 00_1111_01 // SINE R1
 00_0010_01 // SETG R1
-01_00_00_00 // NOP
-01_00_00_00 // NOP
-01_00_00_00 // NOP
 01_00_00_00 // NOP
diff --git a/sw/binary/test7.bit b/sw/binary/test7.bit
@@ -1,6 +1,6 @@
 00_1110_11 // CLEAR R3
 00_0100_00 // GETX R0
-00_0111_01 // GETUSER R1
+00_0110_01 // GETTIME R1
 10_01_01_00 // ADD R0 R1
 00_0000_00 // SETRGB R0
 00_1111_00 // SINE R0

diff --git a/sw/binary/test8.bit b/sw/binary/test8.bit
@@ -1,10 +1,10 @@
-00_0100_00 // GETX R0
-00_0110_01 // GETTIME R1
-10_01_01_00 // ADD R0 R1
-00_1111_10 // SINE R2
+00_1110_11 // CLEAR R3
 00_0101_00 // GETY R0
 00_0110_01 // GETTIME R1
 10_01_01_00 // ADD R0 R1
+00_0000_00 // SETRGB R0
 00_1111_00 // SINE R0
-10_01_10_00 // ADD R0 R2
-00_0000_00 // SETRGB R0
+00_1101_00 // HALF R0
+00_0100_01 // GETX R1
+00_1010_01 // IFGE R1
+00_0000_11 // SETRGB R3
diff --git a/sw/images/test1.png b/sw/images/test1.png
diff --git a/sw/images/test10.png b/sw/images/test10.png
diff --git a/sw/images/test11.png b/sw/images/test11.png
diff --git a/sw/images/test12.png b/sw/images/test12.png
diff --git a/sw/images/test7.png b/sw/images/test7.png
diff --git a/sw/images/test8.png b/sw/images/test8.png
diff --git a/sw/shader/test1.shader b/sw/shader/test1.shader
@@ -8,7 +8,8 @@ SETRGB R0
 GETX R1
 GETY R2
 
-LDI 0x10
+#LDI 0x10
+GETTIME R0
 
 IFEQ R1
 SETRGB R1

diff --git a/sw/shader/test10.shader b/sw/shader/test10.shader
@@ -0,0 +1,19 @@
+# Colored Circles (moving)
+
+# Sine value of X+Time in R2
+GETX R0
+GETTIME R1
+ADD R0 R1
+SINE R2
+
+# Sine value of Y+Time in R0
+GETY R0
+GETTIME R1
+ADD R0 R1
+SINE R0
+
+# Add the colors up
+ADD R0 R2
+
+# Output
+SETRGB R0
diff --git a/sw/shader/test11.shader b/sw/shader/test11.shader
@@ -0,0 +1,13 @@
+# This is a special shader that
+# only works on real hardware
+
+# Each pixel (line) shifts R0 one to the left,
+# if R0 is zero it is set to TIME
+# R0 is then written into RGB
+
+DOUBLE R0
+SETRGB R0
+
+CLEAR R3
+IFEQ R3
+GETTIME R0
diff --git a/sw/shader/test12.shader b/sw/shader/test12.shader
@@ -0,0 +1,17 @@
+# Psychedelic dream
+
+# XOR the sine values of X and Y
+# and add the current time
+
+GETX R0
+SINE R1
+
+GETY R0
+SINE R0
+
+XOR R0 R1
+
+GETTIME R1
+ADD R0 R1
+
+SETRGB R0
diff --git a/sw/shader/test2.shader b/sw/shader/test2.shader
@@ -1,9 +1,14 @@
-# Use sine to set the colors for r and g
+# Use sine values of X and Y to set the colors for R and G
+# Add the time for an animation
+
+GETTIME R2
 
 GETX R0
+ADD R0 R2
 SINE R1
 SETR R1
 
 GETY R0
+ADD R0 R2
 SINE R1
 SETG R1
diff --git a/sw/shader/test3.shader b/sw/shader/test3.shader
@@ -1,5 +1,7 @@
+# Set red color channel to X coord 
 GETX R0
 SETR R0
 
+# Set green color channel to Y coord 
 GETY R1
 SETG R1
diff --git a/sw/shader/test4.shader b/sw/shader/test4.shader
@@ -1,4 +1,5 @@
 # Xor both coordinates and write to rgb
+# Add the time for an animation
 
 GETX R0
 GETY R1

diff --git a/sw/shader/test7.shader b/sw/shader/test7.shader
@@ -1,24 +1,21 @@
-# Sine
+# Draw a rectified sine wave
 
-# Clear R3
 CLEAR R3
 
-# Get sine value depending on x
+# Get X coord (and add time)
 GETX R0
-GETUSER R1
+GETTIME R1
 ADD R0 R1
 
-# Set color to x
+# Set color to X
 SETRGB R0
 
-# Get sine value and half it
+# Get sine value for X and halve it
 SINE R0
 HALF R0
 
-# Get y
+# If sine value is greater than Y
+# clear color to black
 GETY R1
-
-# If sine value is greater than y
-# set color to black
 IFGE R1
 SETRGB R3
diff --git a/sw/shader/test8.shader b/sw/shader/test8.shader
@@ -1,19 +1,21 @@
-# Colored Circles
+# Draw a rectified sine wave
 
-# Sine value of X+Time in R2
-GETX R0
-GETTIME R1
-ADD R0 R1
-SINE R2
+CLEAR R3
 
-# Sine value of Y+Time in R0
+# Get Y coord (and add time)
 GETY R0
 GETTIME R1
 ADD R0 R1
-SINE R0
-
-# Add the colors up
-ADD R0 R2
 
-# Output
+# Set color to Y
 SETRGB R0
+
+# Get sine value for Y and halve it
+SINE R0
+HALF R0
+
+# If sine value is greater than X
+# clear color to black
+GETX R1
+IFGE R1
+SETRGB R3
diff --git a/sw/shader/test9.shader b/sw/shader/test9.shader
@@ -1,4 +1,4 @@
-# Sine
+# Colored Circles (morphing)
 
 # Sine value of X in R2
 GETX R0