amelia
/
3d-gl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: amelia:5b404877c78898eb1308e068a7104e0b2cf1ad7f
Branches Tags
amelia:master
...
compare: amelia:3fff5009df93b220ae3b01d60f7efdbd249430c3
Branches Tags
amelia:master

2 Commits
5b404877c7 ... 3fff5009df

Author SHA1 Message Date
grant squires 3fff5009df closer to working sorting:p 2023-07-17 19:39:02 +00:00
grant squires c808e3c48c i hate sorting 2023-07-15 12:54:52 +00:00
2 changed files with 80 additions and 15 deletions
Show Stats Expand all files Collapse all files

94
src/point.c
View File

@ -35,6 +35,8 @@ double find_z(double x1, double y1, double z1, double x2, double y2, double z2,
}
int point_on_line(double x,double y,double lx1,double ly1, double lx2,double ly2){
if(diff(x,lx1)<=DB_DIS&&diff(y,ly1)<=DB_DIS||diff(x,lx2)<=DB_DIS&&diff(y,ly2)<=DB_DIS)
return 1;
double crossproduct = (y-ly1)*(lx2-lx1) - (x-lx1)*(ly2-ly1);
if(fabs(crossproduct)>FL_DIS)
return 0;
@ -981,14 +983,27 @@ glfl_ar** transp(glfl_ar** con,int lle){
}
return neww;
}
void sort_polygons(point_m* aaaa, glfl_ar** con){
void sort_polygons2(point_m* aaaa, glfl_ar** con){
printf("e\n");
int col = 0;
for(int i = 0; i<=aaaa->len-2;i++){
//printf("a\n");
//double maxi = -INFINITY;
int su = -1;
if(con[i]->max.z<con[i+1]->max.z&&con[i]->min.z<con[i+1]->min.z){
//printf("%f %f, %f %f\n",con[i]->max.z,con[i]->min.z,con[i+1]->max.z,con[i+1]->min.z);
glfl_ar* tempp = con[i];
con[i] = con[i+1];
con[i+1] = tempp;
//col=1;
i=-1;
continue;
}
int scol = 0;
for(int p = 0; p<=con[i]->len-2; p++){
//if(su!=-1)
//printf("%i\n",su);
if(su>con[i+1]->len)break;
// printf("%i\n",su);
double mma = 77777;
cord aa = poi_d(con[i]->pix[p*2],con[i]->pix[p*2+1],con[i]->pix[(p+1)*2],con[i]->pix[(p+1)*2+1],con[i+1]->len,con[i+1]->pix,0,-1,su);
@ -996,7 +1011,7 @@ void sort_polygons(point_m* aaaa, glfl_ar** con){
//cord bb = poi_d(con[i]->pix[p*2],con[i]->pix[p*2+1],-mma,con[i]->pix[p*2+1],con[i+1]->len,con[i+1]->pix,0,-1);
//printf("%f\n",aa.z);
if(aa.z!=-1){
scol = 1;
double l1x1 = con[i]->pix[p*2];
double l1y1 = con[i]->pix[p*2+1];
double l1z1 = con[i]->dep[p];
@ -1012,27 +1027,34 @@ void sort_polygons(point_m* aaaa, glfl_ar** con){
double l2x2 = con[i+1]->pix[(aa.index+1)*2];
double l2y2 = con[i+1]->pix[(aa.index+1)*2+1];
double l2z2 = con[i+1]->dep[(aa.index+1)];
if(!point_on_line(aa.x,aa.y,l2x1,l2y1,l2x2,l2y2))
abort();
if(!point_on_line(aa.x,aa.y,l2x1,l2y1,l2x2,l2y2)){
//printf("%f %f %f %f %f %f\n",aa.x,aa.y,l2x1,l2y1,l2x2,l2y2);
//warn("no clue how this happened");
//break;
//warn("aborted sorting (collisions didn't collide)",pexit);
break;
}
double lz1 = find_z(l1x1,l1y1,l1z1,l1x2,l1y2,l1z2,aa.x,aa.y);
double lz2 = find_z(l2x1,l2y1,l2z1,l2x2,l2y2,l2z2,aa.x,aa.y);
//printf("(%.2f,%.2f,%.2f)->(%.2f,%.2f,%.2f) & (%.2f,%.2f,%.2f)->(%.2f,%.2f,%.2f) cross at (%.2f,%f) w/ (%.2f,%.2f)\n"
// ,l1x1,l1y1,l1z1,l1x2,l1y2,l1z2,
// l2x1,l2y1,l2z1,l2x2,l2y2,l2z2, aa.x, aa.y,lz1,lz2);
//printf("%f %f > %f %f\n",lz1,lz2,diff(lz1,lz2),FL_DIS);
if(lz1<lz2&&(diff(lz1,lz2)>DB_DIS)){
if(lz1<lz2&&(diff(lz1,lz2)>CLOSE_ENOUGH)&&!isnan(lz1)&&!isnan(lz2)){
//printf("%f %f\n",lz1,lz2);
//printf("%f %f > %f %f\n",lz1,lz2,diff(lz1,lz2),FL_DIS);
//printf("sw, %.2f,%.2f,%.2f -> %.2f,%.2f,%.2f\n",con[i]->col[0],con[i]->col[1],con[i]->col[2],
// con[i+1]->col[0],con[i+1]->col[1],con[i+1]->col[2]);
glfl_ar* tempp = con[i];
con[i] = con[i+1];
con[i+1] = tempp;
col = 1;
i=-1;
break;
}
//su = aa.index+1;
//p--;
su = aa.index+1;
p--;
//maxi = greater(maxi,con[i]->dep[p]);
//double sl1 = (con[i]->dep[p+1] - con[i]->dep[p])/(con[i]->pix[(p+1)*2] - con[i]->pix[p*2]);
//double nz1 = con[i]->dep[p] + sl1 * (aa.x - con[i]->pix[(p*2)]) + sl1 * (aa.y - con[i]->pix[(p*2+1)]);
@ -1053,8 +1075,15 @@ void sort_polygons(point_m* aaaa, glfl_ar** con){
i=-1;
break;
}*/
}
}
}
if(0&&!scol&&con[i]->min.z<con[i+1]->min.z){
//printf("%i\n",i);
glfl_ar* tempp = con[i];
con[i] = con[i+1];
con[i+1] = tempp;
}
@ -1072,8 +1101,40 @@ void sort_polygons(point_m* aaaa, glfl_ar** con){
i=-1;
}
*/
}
if(col)
sort_polygons2(aaaa,con);
}
void sort_polygons(point_m* aaaa, glfl_ar** con){
printf("---\n");
for(int i = 0; i<=aaaa->len-2;i++){
//for(int p = 0; p<=con[i]->len-2; p++){
if(con[i]->avg.z<con[i+1]->avg.z){
glfl_ar* tempp = con[i];
con[i] = con[i+1];
con[i+1] = tempp;
//col=1;
i--;
break;
}
//}
}
for(int i = 0; i<=aaaa->len-2;i++){
//for(int p = 0; p<=con[i]->len-2; p++){
if(con[i]->max.z<con[i+1]->max.z&&con[i]->min.z<con[i+1]->min.z){
glfl_ar* tempp = con[i];
con[i] = con[i+1];
con[i+1] = tempp;
//col=1;
i--;
break;
}
//}
}
sort_polygons2(aaaa,con);
}
glfl_ar* perspective_proj(GLFWwindow* b,point_arr* c,double ctx,double cty,double ctz,double cx, double cy, double cz){
GLfloat* pixels = malloc(sizeof(*pixels)*((1+c->len)*3));
@ -1499,7 +1560,7 @@ int main(int argc,char*argv[]){
logm("built shaders");
/*
///*
double tl[3] = {5.0,200.0,200.0};
double tr[3] = {200.0,200.0,200.0};
double bl[3] = {5.0,5.0,200.0};
@ -1531,7 +1592,7 @@ int main(int argc,char*argv[]){
//*/
///*
/*
double xxx[5] = {0.0,100.0,100.0,0.0,0.0};
double yyy[5] = {0.0,0.0,100.0,100.0,0.0};
@ -1640,7 +1701,10 @@ int main(int argc,char*argv[]){
for(int i = 0; i<=aaaa->len-1; i++)
printf("%f %f %f\n",con[i]->avg.z,con[i]->max.z,con[i]->min.z);
*/
//printf("---\n");
//for(int i = 0; i<=aaaa->len-1; i++)
// for(int p = 0; p<=con[i]->len-1; p++)
// printf("%f %f\n",con[i]->pix[p*2],con[i]->pix[p*2+1]);
sort_polygons(aaaa,con);
//for(int i = 0; i!=aaaa->len-1; i++)
//for(int z = 0; z!=con[i]->len-1; z++)
@ -1737,7 +1801,7 @@ int main(int argc,char*argv[]){
//free(bba->col);
//free(bba->pix);
//free(bba);
*/
//*/
}
glfw_load(w);

1
src/util.h
View File

@ -7,6 +7,7 @@
static const double FL_DIS = 1e-7;
static const double DB_DIS = 1e-6;
static const double CLOSE_ENOUGH = 1e-4;
static const double NaN = 0.0f/0.0f;
static const int forced_length = 20;