[simspark-cvs] simspark/spark/kerosin/sceneserver axis.cpp, 1.2.2.1.2.1, 1.2.2.1.2.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/kerosin/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10810

Modified Files:
      Tag: projectx
	axis.cpp 
Log Message:
merge from HEAD


Index: axis.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/axis.cpp,v
retrieving revision 1.2.2.1.2.1
retrieving revision 1.2.2.1.2.2
diff -C2 -d -r1.2.2.1.2.1 -r1.2.2.1.2.2
*** axis.cpp	1 Jun 2007 13:21:20 -0000	1.2.2.1.2.1
--- axis.cpp	17 Jun 2007 08:44:59 -0000	1.2.2.1.2.2
***************
*** 30,34 ****
  }
  
! void Axis::RenderInternal()
  {
      RGBA colX(1,0,0,1);
--- 30,34 ----
  }
  
! void Axis::RenderAxis(float size)
  {
      RGBA colX(1,0,0,1);
***************
*** 41,45 ****
      glBegin(GL_LINE_LOOP);
      glVertex3f(0,0,0);
!     glVertex3f(mSize,0,0);
      glEnd();
  
--- 41,45 ----
      glBegin(GL_LINE_LOOP);
      glVertex3f(0,0,0);
!     glVertex3f(size,0,0);
      glEnd();
  
***************
*** 49,53 ****
      glBegin(GL_LINE_LOOP);
      glVertex3f(0,0,0);
!     glVertex3f(0,mSize,0);
      glEnd();
  
--- 49,53 ----
      glBegin(GL_LINE_LOOP);
      glVertex3f(0,0,0);
!     glVertex3f(0,size,0);
      glEnd();
  
***************
*** 58,65 ****
      glBegin(GL_LINE_LOOP);
      glVertex3f(0,0,0);
!     glVertex3f(0,0,mSize);
      glEnd();
  }
  
  float Axis::GetSize()
  {
--- 58,70 ----
      glBegin(GL_LINE_LOOP);
      glVertex3f(0,0,0);
!     glVertex3f(0,0,size);
      glEnd();
  }
  
+ void Axis::RenderInternal()
+ {
+     RenderAxis(mSize);
+ }
+ 
  float Axis::GetSize()
  {