diff options
| author | epoch <epoch@hacking.allowed.org> | 2017-02-09 03:05:41 -0600 |
|---|---|---|
| committer | epoch <epoch@hacking.allowed.org> | 2017-02-09 03:05:41 -0600 |
| commit | 17347b2e23292aad11c879d3df4a0e73c31e2ae8 (patch) | |
| tree | e124afb91a59e1f415051a097446b713c5f78d79 /src | |
| parent | d98c4fe440f2abe3a6682e9e7f9a439fe2540a21 (diff) | |
| download | hackvr-17347b2e23292aad11c879d3df4a0e73c31e2ae8.tar.gz hackvr-17347b2e23292aad11c879d3df4a0e73c31e2ae8.zip | |
fixed up some red and blue stuff and put (hopefully) useful stuff into README. Also made testit.sh use a pre-converted version of the female mesh so people will not need perl to test it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.h | 4 | ||||
| -rw-r--r-- | src/graphics.c | 2 | ||||
| -rwxr-xr-x | src/testit.sh | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/config.h b/src/config.h index 92960c5..08ce918 100644 --- a/src/config.h +++ b/src/config.h @@ -9,8 +9,8 @@ #define DEBUG 1 #define WALK_SPEED 1 #define SPLIT_SCREEN 2 -#define CAMERA_SEPARATION .0125 -#define RED_AND_BLUE 0 +#define CAMERA_SEPARATION -1 +#define RED_AND_BLUE 1 #define SHAPES 16386 #define MAX_SIDES 8 #define WIDTH 4000 diff --git a/src/graphics.c b/src/graphics.c index cdd9c4a..3cb973f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -419,7 +419,7 @@ void draw_screen() { for(i=0;global.shape[i];i++) { //now we pick the color of this triangle! if(gra_global.red_and_blue) { - if(cn==0) { + if(cn%2==0) { set_color_red(); } else { set_color_blue(); diff --git a/src/testit.sh b/src/testit.sh index daecd55..86aca19 100755 --- a/src/testit.sh +++ b/src/testit.sh @@ -1,7 +1,7 @@ #!/bin/bash -cat <(../tools/obj2hackvr2.pl woman ../meshes/female_basemesh1_2.obj | sort -R) \ - <(echo "woman move 10 0 0") \ - <(../tools/obj2hackvr2.pl woman2 ../meshes/female_basemesh1_2.obj | sort -R) \ - <(echo "woman2 move -10 0 0") \ - <(../tools/obj2hackvr2.pl woman3 ../meshes/female_basemesh1_2.obj | sort -R) | ./slowcat 10000 | ./hackvr $USER +cat <(sort -R ../meshes/female_basemesh1_2.hackvr) \ + <(echo "woman move 10 0 -50") \ + <(sort -R ../meshes/female_basemesh1_2.hackvr | sed 's/woman/woman2/g') \ + <(echo "woman2 move -10 0 -200") \ + <(sort -R ../meshes/female_basemesh1_2.hackvr | sed 's/woman/woamn3/g') | ./slowcat 10000 | ./hackvr $USER #../tools/obj2hackvr.pl woman ../meshes/female_basemesh1_2.obj | ./hackvr epoch |