Difference for arch/ogl/ogl.c from version 1.28 to 1.29


version 1.28 version 1.29
Line 69
 
Line 69
 #endif  #endif
   
 int sphereh=0;  int sphereh=0;
 int circleh5=0;  
 int circleh10=0;  
 int cross_lh[2]={0,0};  int cross_lh[2]={0,0};
 int primary_lh[3]={0,0,0};  int primary_lh[3]={0,0,0};
 int secondary_lh[5]={0,0,0,0,0};  int secondary_lh[5]={0,0,0,0,0};
Line 114
 
Line 112
 void ogl_smash_texture_list_internal(void){  void ogl_smash_texture_list_internal(void){
  int i;   int i;
  sphereh=0;   sphereh=0;
  circleh5=0;  
  circleh10=0;  
  memset(cross_lh,0,sizeof(cross_lh));   memset(cross_lh,0,sizeof(cross_lh));
  memset(primary_lh,0,sizeof(primary_lh));   memset(primary_lh,0,sizeof(primary_lh));
  memset(secondary_lh,0,sizeof(secondary_lh));   memset(secondary_lh,0,sizeof(secondary_lh));
Line 554
 
Line 550
  return 0;   return 0;
   
 }  }
 int gr_ucircle(fix xc1,fix yc1,fix r1){//dunno if this really works, radar doesn't seem to.. hm..  int gr_ucircle(fix xc1,fix yc1,fix r1){
  int c;   int c;
  c=grd_curcanv->cv_color;   c=grd_curcanv->cv_color;
  OGL_DISABLE(TEXTURE_2D);   OGL_DISABLE(TEXTURE_2D);
 // glPointSize(f2glf(rad));  
  glColor3f(CPAL2Tr(c),CPAL2Tg(c),CPAL2Tb(c));   glColor3f(CPAL2Tr(c),CPAL2Tg(c),CPAL2Tb(c));
 // glBegin(GL_POINTS);  
 // glVertex3f(f2glf(pnt->p3_vec.x),f2glf(pnt->p3_vec.y),-f2glf(pnt->p3_vec.z));  
 // glEnd();  
  glPushMatrix();   glPushMatrix();
  glmprintf((0,"circle: %f(%i),%f(%i),%f\n",(f2fl(xc1)+grd_curcanv->cv_bitmap.bm_x)/(float)last_width,f2i(xc1),(f2fl(yc1)+grd_curcanv->cv_bitmap.bm_y)/(float)last_height,f2i(yc1),f2fl(r1)));  
  glTranslatef(   glTranslatef(
  (f2fl(xc1)+grd_curcanv->cv_bitmap.bm_x)/(float)last_width,   (f2fl(xc1)+grd_curcanv->cv_bitmap.bm_x+0.5)/(float)last_width,
  1.0-(f2fl(yc1)+grd_curcanv->cv_bitmap.bm_y)/(float)last_height,0);   1.0-(f2fl(yc1)+grd_curcanv->cv_bitmap.bm_y+0.5)/(float)last_height,0);
  glScalef(f2fl(r1),f2fl(r1),f2fl(r1));   glScalef(f2fl(r1)/last_width,f2fl(r1)/last_height,1.0);
  if (r1<=i2f(5)){   ogl_drawcircle(10+2*(int)(M_PI*f2fl(r1)/19),GL_LINE_LOOP);
  if (!circleh5) circleh5=circle_list_init(5,GL_LINE_LOOP,GL_COMPILE_AND_EXECUTE);  
  else glCallList(circleh5);  
  }else{  
  if (!circleh10) circleh10=circle_list_init(10,GL_LINE_LOOP,GL_COMPILE_AND_EXECUTE);  
  else glCallList(circleh10);  
  }  
  glPopMatrix();   glPopMatrix();
  return 0;   return 0;
 }  }

Legend:
line(s) removed in v.1.28 
line(s) changed
 line(s) added in v.1.29