rayzor

diff src/m3drast.c @ 22:5380ff64e83f

minor changes from dos, and line endings cleanup
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 02 May 2014 14:32:58 +0300
parents d94a69933a71
children
line diff
     1.1 --- a/src/m3drast.c	Tue Apr 15 20:52:05 2014 +0300
     1.2 +++ b/src/m3drast.c	Fri May 02 14:32:58 2014 +0300
     1.3 @@ -1,56 +1,56 @@
     1.4 -#include "m3dimpl.h"
     1.5 -#include "lines.h"
     1.6 -
     1.7 -
     1.8 -void m3d_draw_point(struct min3d_vertex *v)
     1.9 -{
    1.10 -	int x = v->pos[0] + 0.5;
    1.11 -	int y = v->pos[1] + 0.5;
    1.12 -	int xsz = m3dctx->cbuf->xsz;
    1.13 -	m3dctx->cbuf->pixels[y * xsz + x] = v->color;
    1.14 -}
    1.15 -
    1.16 -void m3d_draw_line(struct min3d_vertex *v)
    1.17 -{
    1.18 -	int x0, y0, x1, y1;
    1.19 -
    1.20 -	x0 = v[0].pos[0];
    1.21 -	y0 = v[0].pos[1];
    1.22 -	x1 = v[1].pos[0];
    1.23 -	y1 = v[1].pos[1];
    1.24 -
    1.25 -	if(clip_line2d(&x0, &y0, &x1, &y1, m3dctx->vport)) {
    1.26 -		draw_line(m3dctx->cbuf->pixels, m3dctx->cbuf->xsz, v->color, x0, y0, x1, y1);
    1.27 -	}
    1.28 -}
    1.29 -
    1.30 -void m3d_draw_poly(struct min3d_vertex *v, int numv)
    1.31 -{
    1.32 -	int i;
    1.33 -	struct min3d_vertex last[2];
    1.34 -
    1.35 -	if(ENABLED(M3D_CULL_FACE)) {
    1.36 -		float a[2], b[2], crossz = 0;
    1.37 -
    1.38 -		for(i=1; i<numv - 1; i++) {
    1.39 -			int n = i + 1;
    1.40 -			a[0] = v[i].pos[0] - v[0].pos[0];
    1.41 -			a[1] = v[i].pos[1] - v[0].pos[1];
    1.42 -
    1.43 -			b[0] = v[n].pos[0] - v[0].pos[0];
    1.44 -			b[1] = v[n].pos[1] - v[0].pos[1];
    1.45 -
    1.46 -			crossz += a[0] * b[1] - a[1] * b[0];
    1.47 -		}
    1.48 -
    1.49 -		if(crossz > 0) return;
    1.50 -	}
    1.51 -
    1.52 -	last[0] = v[numv - 1];
    1.53 -	last[1] = v[0];
    1.54 -
    1.55 -	for(i=0; i<numv - 1; i++) {
    1.56 -		m3d_draw_line(v++);
    1.57 -	}
    1.58 -	m3d_draw_line(last);
    1.59 -}
    1.60 +#include "m3dimpl.h"
    1.61 +#include "lines.h"
    1.62 +
    1.63 +
    1.64 +void m3d_draw_point(struct min3d_vertex *v)
    1.65 +{
    1.66 +	int x = v->pos[0] + 0.5;
    1.67 +	int y = v->pos[1] + 0.5;
    1.68 +	int xsz = m3dctx->cbuf->xsz;
    1.69 +	m3dctx->cbuf->pixels[y * xsz + x] = v->color;
    1.70 +}
    1.71 +
    1.72 +void m3d_draw_line(struct min3d_vertex *v)
    1.73 +{
    1.74 +	int x0, y0, x1, y1;
    1.75 +
    1.76 +	x0 = v[0].pos[0];
    1.77 +	y0 = v[0].pos[1];
    1.78 +	x1 = v[1].pos[0];
    1.79 +	y1 = v[1].pos[1];
    1.80 +
    1.81 +	if(clip_line2d(&x0, &y0, &x1, &y1, m3dctx->vport)) {
    1.82 +		draw_line(m3dctx->cbuf->pixels, m3dctx->cbuf->xsz, v->color, x0, y0, x1, y1);
    1.83 +	}
    1.84 +}
    1.85 +
    1.86 +void m3d_draw_poly(struct min3d_vertex *v, int numv)
    1.87 +{
    1.88 +	int i;
    1.89 +	struct min3d_vertex last[2];
    1.90 +
    1.91 +	if(ENABLED(M3D_CULL_FACE)) {
    1.92 +		float a[2], b[2], crossz = 0;
    1.93 +
    1.94 +		for(i=1; i<numv - 1; i++) {
    1.95 +			int n = i + 1;
    1.96 +			a[0] = v[i].pos[0] - v[0].pos[0];
    1.97 +			a[1] = v[i].pos[1] - v[0].pos[1];
    1.98 +
    1.99 +			b[0] = v[n].pos[0] - v[0].pos[0];
   1.100 +			b[1] = v[n].pos[1] - v[0].pos[1];
   1.101 +
   1.102 +			crossz += a[0] * b[1] - a[1] * b[0];
   1.103 +		}
   1.104 +
   1.105 +		if(crossz > 0) return;
   1.106 +	}
   1.107 +
   1.108 +	last[0] = v[numv - 1];
   1.109 +	last[1] = v[0];
   1.110 +
   1.111 +	for(i=0; i<numv - 1; i++) {
   1.112 +		m3d_draw_line(v++);
   1.113 +	}
   1.114 +	m3d_draw_line(last);
   1.115 +}