a08d0fc53f
An animated musical demo for X11. PR: 14554 Submitted by: Trevor Johnson <trevor@jpj.net>
65 lines
2.1 KiB
Text
65 lines
2.1 KiB
Text
--- 3d.cc.orig Sun Dec 26 17:23:11 1999
|
|
+++ 3d.cc Sun Dec 26 17:24:10 1999
|
|
@@ -234,7 +234,7 @@
|
|
if(x2ZGTS > offset && x1<offset+vidSizeX) {
|
|
if(x2ZGTS > offset+vidSizeX-1) x2ZGTS = offset+vidSizeX-1;
|
|
if(x1<offset) {
|
|
- register tmp = offset-x1;
|
|
+ register int tmp = offset-x1;
|
|
DrawLineZGTS( offset, leftz+zsZGTS*tmp, leftl+lsZGTS*tmp,
|
|
shorts( leftt.s.u+tsZGTS.s.u*tmp,
|
|
leftt.s.v+tsZGTS.s.v*tmp ) );
|
|
@@ -260,7 +260,7 @@
|
|
if(*x2ZGT > offset+vidSizeX)
|
|
*x2ZGT = offset+vidSizeX;
|
|
if( x1 < offset ) {
|
|
- register tmp = offset-x1;
|
|
+ register int tmp = offset-x1;
|
|
DrawLineZGT( offset, leftz+*zsZGT*tmp, leftl+*lsZGT*tmp,
|
|
shorts( leftt.s.u+tsZGT->s.u*tmp,
|
|
leftt.s.v+tsZGT->s.v*tmp ) );
|
|
@@ -339,7 +339,7 @@
|
|
if(x2ZG> offset && x1<offset+vidSizeX) {
|
|
if(x2ZG> offset+vidSizeX) x2ZG= offset+vidSizeX;
|
|
if(x1<offset) {
|
|
- register tmp = offset-x1;
|
|
+ register int tmp = offset-x1;
|
|
DrawLineZG( offset, leftz+zsZG*tmp, leftl+lsZG*tmp, 0 );
|
|
}
|
|
else {
|
|
@@ -373,7 +373,7 @@
|
|
if(x2SGT > offset+vidSizeX)
|
|
x2SGT = offset+vidSizeX;
|
|
if( x1 < offset ) {
|
|
- register tmp = offset-x1;
|
|
+ register int tmp = offset-x1;
|
|
DrawLineSGT( offset, 0, leftl+lsSGT*tmp,
|
|
shorts( leftt.s.u+tsSGT.s.u*tmp,
|
|
leftt.s.v+tsSGT.s.v*tmp ) );
|
|
@@ -455,7 +455,7 @@
|
|
if(*x2ZP > offset && x1<offset+vidSizeX) {
|
|
if(*x2ZP > offset+vidSizeX) *x2ZP = offset+vidSizeX;
|
|
if(x1<offset) {
|
|
- register tmp = offset-x1;
|
|
+ register int tmp = offset-x1;
|
|
DrawLineZP( offset, leftz+*zsZP*tmp,
|
|
shorts( leftl.s.u+lsZP->s.u*tmp,
|
|
leftl.s.v+lsZP->s.v*tmp ), 0 );
|
|
@@ -492,7 +492,7 @@
|
|
if(*x2SP> offset && x1<offset+vidSizeX) {
|
|
if(*x2SP> offset+vidSizeX) *x2SP = offset+vidSizeX;
|
|
if(x1<offset) {
|
|
- register tmp = offset-x1;
|
|
+ register int tmp = offset-x1;
|
|
DrawLineSP( offset, 0,
|
|
shorts( leftl.s.u+lsSP->s.u*tmp,
|
|
leftl.s.v+lsSP->s.v*tmp ), 0 );
|
|
@@ -1455,7 +1455,7 @@
|
|
|
|
void FacedObject::SplitFace( Face* f, bool vertical )
|
|
{
|
|
- static color = 255;
|
|
+ static int color = 255;
|
|
Point *p1, *p2;
|
|
int n1 ,n2;
|
|
bool s01 = false;
|