projects
/
fishladder.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c3a8b9
)
added curves for start/end points to prevent clipping
author
hgn
<hgodden00@gmail.com>
Fri, 5 Nov 2021 12:10:50 +0000
(12:10 +0000)
committer
hgn
<hgodden00@gmail.com>
Fri, 5 Nov 2021 12:10:50 +0000
(12:10 +0000)
fishladder.c
patch
|
blob
|
history
fishladder_resources.h
patch
|
blob
|
history
diff --git
a/fishladder.c
b/fishladder.c
index c4d575d4642e73f3caf0a35d3c5937936b9c36c5..0c07ddf56bc0e78f03b8180623f0b4d170602841 100644
(file)
--- a/
fishladder.c
+++ b/
fishladder.c
@@
-635,6
+635,9
@@
v2f const curve_6[] = {{0.5f,1.0f},{0.5f,0.625f},{0.375f,0.5f},{0.0f,0.5f}};
v2f const curve_9[] = {{1.0f,0.5f},{0.625f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
v2f const curve_12[]= {{0.0f,0.5f},{0.375f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
v2f const curve_9[] = {{1.0f,0.5f},{0.625f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
v2f const curve_12[]= {{0.0f,0.5f},{0.375f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
+v2f const curve_2[] = {{0.5f,1.0f},{0.5f,0.8f},{0.5f,0.3f},{0.5f,0.2f}};
+v2f const curve_8[] = {{0.5f,0.8f},{0.5f,0.5f},{0.5f,0.3f},{0.5f,0.0f}};
+
v2f const curve_7[] = {{0.5f,0.8438f},{0.875f,0.8438f},{0.625f,0.5f},{1.0f,0.5f}};
v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},{0.0f,0.5f}};
v2f const curve_7[] = {{0.5f,0.8438f},{0.875f,0.8438f},{0.625f,0.5f},{1.0f,0.5f}};
v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},{0.0f,0.5f}};
@@
-964,6
+967,8
@@
void vg_update(void)
else
curve = curve_9;
break;
else
curve = curve_9;
break;
+ case 2: curve = curve_2; break;
+ case 8: curve = curve_8; break;
case 3: curve = curve_3; break;
case 6: curve = curve_6; break;
case 9: curve = curve_9; break;
case 3: curve = curve_3; break;
case 6: curve = curve_6; break;
case 9: curve = curve_9; break;
diff --git
a/fishladder_resources.h
b/fishladder_resources.h
index 4408dcf8784b4ecfe293a7fcb76443099af5c04d..511854b8c107fc8d25d44d5b615f84ef263c41a2 100644
(file)
--- a/
fishladder_resources.h
+++ b/
fishladder_resources.h
@@
-299,3
+299,22
@@
void vg_register(void)
SHADER_INIT( shader_ball );
SHADER_INIT( shader_background );
}
SHADER_INIT( shader_ball );
SHADER_INIT( shader_background );
}
+
+/*
+ 0000 0 | 0001 1 | 0010 2 | 0011 3
+ | | | | |
+ X | X= | X | X=
+ | | |
+ 0100 4 | 0101 5 | 0110 6 | 0111 7
+ | | | | |
+ =X | =X= | =X | =X=
+ | | |
+ 1000 8 | 1001 9 | 1010 10 | 1011 11
+ | | | | |
+ X | X= | X | X=
+ | | | | | | |
+ 1100 12 | 1101 13 | 1110 14 | 1111 15
+ | | | | |
+ =X | =X= | =X | =X=
+ | | | | | | |
+*/