add files not currently available in source (e.g. docs, modules, etc.)

set svn:eol-style property to native for all ascii files to support cross platform development

3d-viewer/3d_aux.cpp

@@ -181,39 +181,39 @@ Info_3D_Visu::~Info_3D_Visu(void)
 /*****************************************************************/
 
 WinEDA_VertexCtrl::WinEDA_VertexCtrl(wxWindow *parent, const wxString & title,
-						wxBoxSizer * BoxSizer,
+						wxBoxSizer * BoxSizer,
 						int units, int internal_unit)
 {
 wxString text;
-wxStaticText * msgtitle;
+wxStaticText * msgtitle;
 	
 	m_Units = units;
 	m_Internal_Unit = internal_unit;
 
 	if ( title.IsEmpty()  )	text = _("Vertex ");
-	else text = title;
+	else text = title;
 	text += ReturnUnitSymbol(units);
-
-	msgtitle = new wxStaticText(parent, -1, text, wxDefaultPosition, wxSize(-1,-1), 0 );
-	BoxSizer->Add(msgtitle, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxBOTTOM|wxADJUST_MINSIZE);
 
-    wxFlexGridSizer * GridSizer = new wxFlexGridSizer(3, 2, 0, 0);
-    BoxSizer->Add(GridSizer, 0, wxGROW|wxALL, 5);
-
+	msgtitle = new wxStaticText(parent, -1, text, wxDefaultPosition, wxSize(-1,-1), 0 );
+	BoxSizer->Add(msgtitle, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxBOTTOM|wxADJUST_MINSIZE);
+
+    wxFlexGridSizer * GridSizer = new wxFlexGridSizer(3, 2, 0, 0);
+    BoxSizer->Add(GridSizer, 0, wxGROW|wxALL, 5);
+
 	msgtitle = new wxStaticText(parent, -1, wxT("X:"));
-    GridSizer->Add(msgtitle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+    GridSizer->Add(msgtitle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 	m_XValueCtrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0 );
-	GridSizer->Add(m_XValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+	GridSizer->Add(m_XValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
 	msgtitle = new wxStaticText(parent, -1, wxT("Y:"), wxDefaultPosition, wxSize(-1,-1), 0 );
-    GridSizer->Add(msgtitle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+    GridSizer->Add(msgtitle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 	m_YValueCtrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0 );
-	GridSizer->Add(m_YValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+	GridSizer->Add(m_YValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
 	msgtitle = new wxStaticText(parent, -1, wxT("Z:"), wxDefaultPosition, wxSize(-1,-1), 0 );
-	GridSizer->Add(msgtitle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+	GridSizer->Add(msgtitle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 	m_ZValueCtrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0 );
-	GridSizer->Add(m_ZValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+	GridSizer->Add(m_ZValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 }
 
 WinEDA_VertexCtrl::~WinEDA_VertexCtrl(void)
@@ -229,11 +229,11 @@ S3D_Vertex WinEDA_VertexCtrl::GetValue(void)
 {
 S3D_Vertex value;
 double dtmp;
-
+
 	m_XValueCtrl->GetValue().ToDouble(&dtmp);
-	value.x = dtmp;
+	value.x = dtmp;
 	m_YValueCtrl->GetValue().ToDouble(&dtmp);
-	value.y = dtmp;
+	value.y = dtmp;
 	m_ZValueCtrl->GetValue().ToDouble(&dtmp);
 	value.z = dtmp;
 	return value;

3d-viewer/3d_canvas.cpp

@@ -225,34 +225,34 @@ float spin_quat[4];
 
 	if ( event.m_wheelRotation )
 	{
-        if( event.ShiftDown() ) {
-            if ( event.GetWheelRotation() < 0 ) {
-               /* up */
-               SetView3D(WXK_UP);
-            } else {
-               /* down */
-               SetView3D(WXK_DOWN);
-           }
-        } else if( event.ControlDown() ) {
-            if ( event.GetWheelRotation() > 0 ) {
-                /* right */
-                SetView3D(WXK_RIGHT);
-            } else {
-                /* left */
-                SetView3D(WXK_LEFT);
-            }
-        }
-        else {
-            if ( event.GetWheelRotation() > 0 )
-            {
-                g_Parm_3D_Visu.m_Zoom /= 1.4;
-                if ( g_Parm_3D_Visu.m_Zoom <= 0.01)
-                    g_Parm_3D_Visu.m_Zoom = 0.01;
-            }
-            else g_Parm_3D_Visu.m_Zoom *= 1.4;
-            DisplayStatus();
-            Refresh(FALSE);
-        }
+        if( event.ShiftDown() ) {
+            if ( event.GetWheelRotation() < 0 ) {
+               /* up */
+               SetView3D(WXK_UP);
+            } else {
+               /* down */
+               SetView3D(WXK_DOWN);
+           }
+        } else if( event.ControlDown() ) {
+            if ( event.GetWheelRotation() > 0 ) {
+                /* right */
+                SetView3D(WXK_RIGHT);
+            } else {
+                /* left */
+                SetView3D(WXK_LEFT);
+            }
+        }
+        else {
+            if ( event.GetWheelRotation() > 0 )
+            {
+                g_Parm_3D_Visu.m_Zoom /= 1.4;
+                if ( g_Parm_3D_Visu.m_Zoom <= 0.01)
+                    g_Parm_3D_Visu.m_Zoom = 0.01;
+            }
+            else g_Parm_3D_Visu.m_Zoom *= 1.4;
+            DisplayStatus();
+            Refresh(FALSE);
+        }
  	}
 
     if (event.Dragging())
@@ -442,7 +442,7 @@ void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event )
 #ifndef __WXMOTIF__
     if (!GetContext()) return;
 #endif
-	Redraw();
+	Redraw();
 	event.Skip();
 }
 

3d-viewer/3d_class.cpp

@@ -1,119 +1,119 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        3d_class.cpp
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
-#include "fctsys.h"
-
-#include "common.h"
-
-#include "3d_struct.h"
-#include "3d_viewer.h"
-
-
-/****************************/
-S3D_Vertex::S3D_Vertex(void)
-/****************************/
-{
-	x = y = z = 0.0;
-}
-
-
-/**************************************************************************/
-S3D_Material::S3D_Material(Struct3D_Master * father, const wxString & name):
-		EDA_BaseStruct( father, -1)
-/**************************************************************************/
-{
-	m_DiffuseColor.x = m_DiffuseColor.y = m_DiffuseColor.z = 1.0;
-    m_SpecularColor.x = m_SpecularColor.y = m_SpecularColor.z = 1.0;
-    m_AmbientIntensity = 1.0;
-    m_Transparency = 0.0;
-    m_Shininess = 1.0;
-	m_Name = name;
-}
-
-/***********************************/
-void S3D_Material::SetMaterial(void)
-/***********************************/
-{
-    glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
-	glColor4f(m_DiffuseColor.x * m_AmbientIntensity,
-		m_DiffuseColor.y * m_AmbientIntensity,
-		m_DiffuseColor.z * m_AmbientIntensity,
-		1.0 - m_Transparency );
-#if 0
-	glColorMaterial(GL_FRONT_AND_BACK,GL_SPECULAR);
-	glColor3f(m_SpecularColor.x, m_SpecularColor.y,m_SpecularColor.z);
-#endif
-    glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
-}
-
-/****************************************************/
-void Struct3D_Master::Copy(Struct3D_Master * pattern)
-/****************************************************/
-{
-	m_Shape3DName = pattern->m_Shape3DName;
-	m_MatScale = pattern->m_MatScale;
-	m_MatRotation = pattern->m_MatRotation;
-	m_MatPosition = pattern->m_MatPosition;
-	m_3D_Drawings = NULL;
-	m_Materials = NULL;
-}
-
-/***************************************************************/
-Struct3D_Master::Struct3D_Master(EDA_BaseStruct * StructFather):
-		EDA_BaseStruct( StructFather, -1)
-/***************************************************************/
-{
-	m_MatScale.x = m_MatScale.y = m_MatScale.z = 1.0;
-	m_3D_Drawings = NULL;
-	m_Materials = NULL;
-}
-
-
-/***************************************/
-Struct3D_Master:: ~Struct3D_Master(void)
-/***************************************/
-{
-Struct3D_Shape * next;
-S3D_Material * nextmat;
-
-	for( ; m_3D_Drawings != NULL; m_3D_Drawings = next )
-	{
-		next = (Struct3D_Shape *) m_3D_Drawings->Pnext;
-		delete m_3D_Drawings;
-	}
-
-	for( ; m_Materials != NULL;  m_Materials = nextmat )
-	{
-		nextmat = (S3D_Material *)  m_Materials->Pnext;
-		delete  m_Materials;
-	}
-}
-
-
-
-/***************************************************************/
-Struct3D_Shape::Struct3D_Shape(EDA_BaseStruct * StructFather):
-		EDA_BaseStruct( StructFather, -1)
-/***************************************************************/
-{
-	m_3D_Coord = NULL;
-	m_3D_CoordIndex = NULL;
-	m_3D_Points = 0;
-}
-
-
-/***************************************/
-Struct3D_Shape:: ~Struct3D_Shape(void)
-/***************************************/
-{
-	delete m_3D_Coord;
-	delete m_3D_CoordIndex;
-}
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        3d_class.cpp
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifdef __GNUG__
+#pragma implementation
+#pragma interface
+#endif
+
+#include "fctsys.h"
+
+#include "common.h"
+
+#include "3d_struct.h"
+#include "3d_viewer.h"
+
+
+/****************************/
+S3D_Vertex::S3D_Vertex(void)
+/****************************/
+{
+	x = y = z = 0.0;
+}
+
+
+/**************************************************************************/
+S3D_Material::S3D_Material(Struct3D_Master * father, const wxString & name):
+		EDA_BaseStruct( father, -1)
+/**************************************************************************/
+{
+	m_DiffuseColor.x = m_DiffuseColor.y = m_DiffuseColor.z = 1.0;
+    m_SpecularColor.x = m_SpecularColor.y = m_SpecularColor.z = 1.0;
+    m_AmbientIntensity = 1.0;
+    m_Transparency = 0.0;
+    m_Shininess = 1.0;
+	m_Name = name;
+}
+
+/***********************************/
+void S3D_Material::SetMaterial(void)
+/***********************************/
+{
+    glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
+	glColor4f(m_DiffuseColor.x * m_AmbientIntensity,
+		m_DiffuseColor.y * m_AmbientIntensity,
+		m_DiffuseColor.z * m_AmbientIntensity,
+		1.0 - m_Transparency );
+#if 0
+	glColorMaterial(GL_FRONT_AND_BACK,GL_SPECULAR);
+	glColor3f(m_SpecularColor.x, m_SpecularColor.y,m_SpecularColor.z);
+#endif
+    glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
+}
+
+/****************************************************/
+void Struct3D_Master::Copy(Struct3D_Master * pattern)
+/****************************************************/
+{
+	m_Shape3DName = pattern->m_Shape3DName;
+	m_MatScale = pattern->m_MatScale;
+	m_MatRotation = pattern->m_MatRotation;
+	m_MatPosition = pattern->m_MatPosition;
+	m_3D_Drawings = NULL;
+	m_Materials = NULL;
+}
+
+/***************************************************************/
+Struct3D_Master::Struct3D_Master(EDA_BaseStruct * StructFather):
+		EDA_BaseStruct( StructFather, -1)
+/***************************************************************/
+{
+	m_MatScale.x = m_MatScale.y = m_MatScale.z = 1.0;
+	m_3D_Drawings = NULL;
+	m_Materials = NULL;
+}
+
+
+/***************************************/
+Struct3D_Master:: ~Struct3D_Master(void)
+/***************************************/
+{
+Struct3D_Shape * next;
+S3D_Material * nextmat;
+
+	for( ; m_3D_Drawings != NULL; m_3D_Drawings = next )
+	{
+		next = (Struct3D_Shape *) m_3D_Drawings->Pnext;
+		delete m_3D_Drawings;
+	}
+
+	for( ; m_Materials != NULL;  m_Materials = nextmat )
+	{
+		nextmat = (S3D_Material *)  m_Materials->Pnext;
+		delete  m_Materials;
+	}
+}
+
+
+
+/***************************************************************/
+Struct3D_Shape::Struct3D_Shape(EDA_BaseStruct * StructFather):
+		EDA_BaseStruct( StructFather, -1)
+/***************************************************************/
+{
+	m_3D_Coord = NULL;
+	m_3D_CoordIndex = NULL;
+	m_3D_Points = 0;
+}
+
+
+/***************************************/
+Struct3D_Shape:: ~Struct3D_Shape(void)
+/***************************************/
+{
+	delete m_3D_Coord;
+	delete m_3D_CoordIndex;
+}
+

3d-viewer/3d_draw.cpp

@@ -52,7 +52,7 @@ void Pcb3D_GLCanvas::Redraw( void )
 
     build_rotmatrix( mat, g_Parm_3D_Visu.m_Quat );
     glMultMatrixf( &mat[0][0] );
-
+
 	glTranslatef(g_Draw3d_dx, g_Draw3d_dy, 0.0F);
 
     glRotatef(g_Parm_3D_Visu.m_Rot[0], 1.0, 0.0, 0.0);
@@ -459,7 +459,7 @@ int color;
 	drilly = m_Pos.y * scale;
 	/* Draw the pad hole (TODO: draw OBLONG hole)*/
 	if ( holeX && holeY )
-	{
+	{
 		SetGLColor(DARKGRAY);
 		Draw3D_FilledCylinder(drillx, -drilly, hole, g_Parm_3D_Visu.m_LayerZcoord[CMP_N], 0.0);
 	}

3d-viewer/3d_read_mesh.cpp

@@ -31,7 +31,7 @@ int LineNum = 0;
 	{
 		return 1;
 	}
-
+
 	if ( wxIsAbsolutePath(m_Shape3DName) ) fullfilename.Empty();
 	else fullfilename =  g_RealLibDirBuffer + LIB3D_PATH;
 	fullfilename += m_Shape3DName;
@@ -91,7 +91,7 @@ ou du type:
         material USE yellow
 */
 {
-char line[512], * text, * command;
+char line[512], * text, * command;
 wxString mat_name;
 S3D_Material * material = NULL;
 
@@ -104,7 +104,7 @@ S3D_Material * material = NULL;
 
 		for ( material = m_Materials; material != NULL;
 					material = (S3D_Material *) material->Pnext)
-		{
+		{
 			if ( material->m_Name == mat_name)
 			{
 				material->SetMaterial();

3d-viewer/3d_struct.h

@@ -1,136 +1,136 @@
-	/********************************************************/
-	/*	3d_struct.h :  definition des structures de donnees */
-	/*  pour la representation 3D des modules               */
-	/********************************************************/
-
-#ifndef STRUCT_3D_H
-#define STRUCT_3D_H
-
-#include "base_struct.h"
-
-/* 3D modeler units -> PCB units conversion scale:
-	1 "3D unit modeler" = 1 unit wings3d = 2,54 mm = 0.1 inch */
-#define UNITS3D_TO_UNITSPCB 1000
-
-
-class Struct3D_Master;
-class Struct3D_Shape;
-
-class S3D_Color		/* This is a 3D color (R, G, G) 3 floats range 0 to 1.0*/
-{
-public:
-	double m_Red, m_Green, m_Blue;
-public:
-	S3D_Color(void)
-	{
-		m_Red = m_Green = m_Blue = 0;
-	}
-};
-
-class S3D_Vertex	/* This is a 3D coordinate (3 float numbers: x,y,z coordinates)*/
-{
-public:
-	double x, y, z;
-public:
-	S3D_Vertex(void);
-};
-
-class S3D_Material: public EDA_BaseStruct		/* openGL "material" data*/
-{
-public:
-	wxString m_Name;
-	S3D_Vertex m_DiffuseColor;
-    S3D_Vertex m_EmissiveColor;
-    S3D_Vertex m_SpecularColor;
-    float m_AmbientIntensity;
-    float m_Transparency;
-    float m_Shininess;
-
-public:
-	S3D_Material(Struct3D_Master * father, const wxString & name);
-	void SetMaterial(void);
-};
-
-/*******************************************/
-class Struct3D_Master: public EDA_BaseStruct
-/*******************************************/
-/* Master structure for a 3D item description */
-{
-public:
-	wxString m_Shape3DName;		/* 3D shape name in 3D library */
-	S3D_Vertex m_MatScale;
-	S3D_Vertex m_MatRotation;
-	S3D_Vertex m_MatPosition;
-	Struct3D_Shape * m_3D_Drawings;
-	S3D_Material *m_Materials;
-
-public:
-
-	Struct3D_Master(EDA_BaseStruct * StructFather);
-	~Struct3D_Master(void);
-
-	void Copy(Struct3D_Master * pattern);
-	int ReadData(void);
-	int ReadMaterial(FILE * file, int *LineNum);
-	int ReadChildren(FILE * file, int *LineNum);
-	int ReadShape(FILE * file, int *LineNum);
-	int ReadAppearance(FILE * file, int *LineNum);
-	int ReadGeometry(FILE * file, int *LineNum);
-	void Set_Object_Coords(S3D_Vertex * coord, int nbcoord );
-
-};
-
-
-/*********************************************/
-class Struct3D_Shape: public EDA_BaseStruct
-/*********************************************/
-/* decrit une forme complexe 3D */
-{
-public:
-	S3D_Vertex * m_3D_Coord;
-	int * m_3D_CoordIndex;
-	int m_3D_Points;
-
-public:
-
-	Struct3D_Shape(EDA_BaseStruct * StructFather);
-	~Struct3D_Shape(void);
-
-	int ReadData(FILE * file, int *LineNum);
-};
-
-
-
-/*****************************************************************/
-/* Classe pour afficher et editer un Vertex (triplet de valeurs),*/
-/* en INCHES ou MM ou sans unites								 */
-/*****************************************************************/
-/* internal_unit is the internal unit number by inch:
-	- 1000 for EESchema
-	- 10000 for PcbNew
-*/
-class WinEDA_VertexCtrl
-{
-private:
-	int m_Units;
-	int m_Internal_Unit;
-	wxTextCtrl * m_XValueCtrl, * m_YValueCtrl, * m_ZValueCtrl;
-	wxStaticText * m_Text;
-
-public:
-	// Constructor and destructor
-	WinEDA_VertexCtrl(wxWindow *parent, const wxString & title,
-						wxBoxSizer * BoxSizer,
-						int units, int internal_unit);
-
-	~WinEDA_VertexCtrl(void);
-
-	S3D_Vertex GetValue(void);
-	void SetValue(S3D_Vertex vertex);
-	void Enable(bool enbl);
-	void SetToolTip(const wxString & text);
-};
-
-
-
-#endif /* STRUCT_3D_H */
+	/********************************************************/
+	/*	3d_struct.h :  definition des structures de donnees */
+	/*  pour la representation 3D des modules               */
+	/********************************************************/
+
+#ifndef STRUCT_3D_H
+#define STRUCT_3D_H
+
+#include "base_struct.h"
+
+/* 3D modeler units -> PCB units conversion scale:
+	1 "3D unit modeler" = 1 unit wings3d = 2,54 mm = 0.1 inch */
+#define UNITS3D_TO_UNITSPCB 1000
+
+
+class Struct3D_Master;
+class Struct3D_Shape;
+
+class S3D_Color		/* This is a 3D color (R, G, G) 3 floats range 0 to 1.0*/
+{
+public:
+	double m_Red, m_Green, m_Blue;
+public:
+	S3D_Color(void)
+	{
+		m_Red = m_Green = m_Blue = 0;
+	}
+};
+
+class S3D_Vertex	/* This is a 3D coordinate (3 float numbers: x,y,z coordinates)*/
+{
+public:
+	double x, y, z;
+public:
+	S3D_Vertex(void);
+};
+
+class S3D_Material: public EDA_BaseStruct		/* openGL "material" data*/
+{
+public:
+	wxString m_Name;
+	S3D_Vertex m_DiffuseColor;
+    S3D_Vertex m_EmissiveColor;
+    S3D_Vertex m_SpecularColor;
+    float m_AmbientIntensity;
+    float m_Transparency;
+    float m_Shininess;
+
+public:
+	S3D_Material(Struct3D_Master * father, const wxString & name);
+	void SetMaterial(void);
+};
+
+/*******************************************/
+class Struct3D_Master: public EDA_BaseStruct
+/*******************************************/
+/* Master structure for a 3D item description */
+{
+public:
+	wxString m_Shape3DName;		/* 3D shape name in 3D library */
+	S3D_Vertex m_MatScale;
+	S3D_Vertex m_MatRotation;
+	S3D_Vertex m_MatPosition;
+	Struct3D_Shape * m_3D_Drawings;
+	S3D_Material *m_Materials;
+
+public:
+
+	Struct3D_Master(EDA_BaseStruct * StructFather);
+	~Struct3D_Master(void);
+
+	void Copy(Struct3D_Master * pattern);
+	int ReadData(void);
+	int ReadMaterial(FILE * file, int *LineNum);
+	int ReadChildren(FILE * file, int *LineNum);
+	int ReadShape(FILE * file, int *LineNum);
+	int ReadAppearance(FILE * file, int *LineNum);
+	int ReadGeometry(FILE * file, int *LineNum);
+	void Set_Object_Coords(S3D_Vertex * coord, int nbcoord );
+
+};
+
+
+/*********************************************/
+class Struct3D_Shape: public EDA_BaseStruct
+/*********************************************/
+/* decrit une forme complexe 3D */
+{
+public:
+	S3D_Vertex * m_3D_Coord;
+	int * m_3D_CoordIndex;
+	int m_3D_Points;
+
+public:
+
+	Struct3D_Shape(EDA_BaseStruct * StructFather);
+	~Struct3D_Shape(void);
+
+	int ReadData(FILE * file, int *LineNum);
+};
+
+
+
+/*****************************************************************/
+/* Classe pour afficher et editer un Vertex (triplet de valeurs),*/
+/* en INCHES ou MM ou sans unites								 */
+/*****************************************************************/
+/* internal_unit is the internal unit number by inch:
+	- 1000 for EESchema
+	- 10000 for PcbNew
+*/
+class WinEDA_VertexCtrl
+{
+private:
+	int m_Units;
+	int m_Internal_Unit;
+	wxTextCtrl * m_XValueCtrl, * m_YValueCtrl, * m_ZValueCtrl;
+	wxStaticText * m_Text;
+
+public:
+	// Constructor and destructor
+	WinEDA_VertexCtrl(wxWindow *parent, const wxString & title,
+						wxBoxSizer * BoxSizer,
+						int units, int internal_unit);
+
+	~WinEDA_VertexCtrl(void);
+
+	S3D_Vertex GetValue(void);
+	void SetValue(S3D_Vertex vertex);
+	void Enable(bool enbl);
+	void SetToolTip(const wxString & text);
+};
+
+
+
+#endif /* STRUCT_3D_H */

3d-viewer/3d_viewer.h

@@ -1,172 +1,172 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        3d_viewer.h
-/////////////////////////////////////////////////////////////////////////////
-#if !wxUSE_GLCANVAS
-#error Please set wxUSE_GLCANVAS to 1 in setup.h.
-#endif
-
-#include "wx/glcanvas.h"
-
-#ifdef __WXMAC__
-#  ifdef __DARWIN__
-#    include <OpenGL/gl.h>
-#    include <OpenGL/glu.h>
-#  else
-#    include <gl.h>
-#    include <glu.h>
-#  endif
-#else
-#  include <GL/gl.h>
-#  include <GL/glu.h>
-#endif
-
-#ifdef VIEWER_MAIN
-#define global_3d
-#else
-#define global_3d extern
-#endif
-
-#include "pcbstruct.h"
-#include "3d_struct.h"
-
-#define LIB3D_PATH wxT("packages3d/")
-
-class Pcb3D_GLCanvas;
-class WinEDA3D_DrawFrame;
-class Info_3D_Visu;
-class S3D_Vertex;
-class SEGVIA;
-
-
-#define m_ROTX m_Rot[0]
-#define m_ROTY m_Rot[1]
-#define m_ROTZ m_Rot[2]
-
-/* information needed to display 3D board */
-class Info_3D_Visu
-{
-public:
-    float m_Beginx, m_Beginy;	/* position of mouse */
-    float m_Quat[4];			/* orientation of object */
-    float m_Rot[4];				/* man rotation of object */
-    float m_Zoom;				/* field of view in degrees */
-	S3D_Color m_BgColor;
-	wxPoint m_BoardPos;
-	wxSize m_BoardSize;
-	int m_Layers;
-	EDA_BoardDesignSettings * m_BoardSettings;	// Link to current board design settings
-	float m_Epoxy_Width;		/* Epoxy tickness (normalized) */
-
-	float m_BoardScale;			/* Normalisation scale for coordinates:
-								when scaled tey are between -1.0 and +1.0 */
-	float m_LayerZcoord[32];
-public:
-	Info_3D_Visu(void);
-	~Info_3D_Visu(void);
-};
-
-
-class Pcb3D_GLCanvas: public wxGLCanvas
-{
-public:
-	WinEDA3D_DrawFrame * m_Parent;
-
-private:
-	bool   m_init;
-	GLuint m_gllist;
-
-public:
-	Pcb3D_GLCanvas(WinEDA3D_DrawFrame *parent, const wxWindowID id = -1,
-			int* gl_attrib = NULL);
-	~Pcb3D_GLCanvas(void);
-
-	void ClearLists(void);
-
-	void OnPaint(wxPaintEvent& event);
-	void OnSize(wxSizeEvent& event);
-	void OnEraseBackground(wxEraseEvent& event);
-	void OnChar(wxKeyEvent& event);
-	void OnMouseEvent(wxMouseEvent& event);
-	void OnRightClick(wxMouseEvent& event);
-	void OnPopUpMenu(wxCommandEvent & event);
-	void TakeScreenshot(wxCommandEvent & event);
-	void SetView3D(int keycode);
-	void DisplayStatus(void);
-	void Redraw(void);
-	GLuint DisplayCubeforTest(void);
-
-	void OnEnterWindow( wxMouseEvent& event );
-
-	void Render( void );
-	GLuint CreateDrawGL_List(void);
-	void InitGL(void);
-	void SetLights(void);
-	void Draw3D_Track(TRACK * track);
-	void Draw3D_Via(SEGVIA * via);
-	void Draw3D_DrawSegment(DRAWSEGMENT * segment);
-
-DECLARE_EVENT_TABLE()
-};
-
-
-class WinEDA3D_DrawFrame: public wxFrame
-{
-public:
-	WinEDA_BasePcbFrame * m_Parent;
-	WinEDA_App * m_ParentAppl;
-    Pcb3D_GLCanvas * m_Canvas;
-	wxToolBar * m_HToolBar;
-	wxToolBar * m_VToolBar;
-	int m_InternalUnits;
-	wxPoint m_FramePos;
-	wxSize m_FrameSize;
-
-private:
-	wxString m_FrameName;		// name used for writting and reading setup
-								// It is "Frame3D"
-	
-
-public:
-	WinEDA3D_DrawFrame(WinEDA_BasePcbFrame * parent, WinEDA_App *app_parent,
-		const wxString& title );
-
-    void Exit3DFrame(wxCommandEvent& event);
-	void OnCloseWindow(wxCloseEvent & Event);
-	void ReCreateMenuBar(void);
-	void ReCreateHToolbar(void);
-	void ReCreateVToolbar(void);
-	void SetToolbars(void);
-	void GetSettings(void);
-	void SaveSettings(void);
-
-	void OnLeftClick(wxDC * DC, const wxPoint& MousePos);
-	void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu);
-	void OnKeyEvent(wxKeyEvent& event);
-	int BestZoom(void);	// Retourne le meilleur zoom
-	void RedrawActiveWindow(wxDC * DC, bool EraseBg);
-	void Process_Special_Functions(wxCommandEvent& event);
-	void Process_Zoom(wxCommandEvent& event);
-
-	void NewDisplay(void);
-	void Set3DBgColor(void);
-
-DECLARE_EVENT_TABLE()
-};
-
-void SetGLColor(int color);
-void Set_Object_Data(const S3D_Vertex * coord, int nbcoord );
-
-global_3d  Info_3D_Visu g_Parm_3D_Visu;
-global_3d double g_Draw3d_dx, g_Draw3d_dy;
-global_3d double ZBottom, ZTop;
-global_3d double DataScale3D;		// coeff de conversion unites utilsateut -> unites 3D
-global_3d int gl_attrib[]
-#ifdef VIEWER_MAIN
-= { WX_GL_RGBA, WX_GL_MIN_RED, 8, WX_GL_MIN_GREEN, 8,
-            WX_GL_MIN_BLUE, 8, WX_GL_DEPTH_SIZE, 16,
-            WX_GL_DOUBLEBUFFER,
-			GL_NONE }
-#endif
-;
-
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        3d_viewer.h
+/////////////////////////////////////////////////////////////////////////////
+#if !wxUSE_GLCANVAS
+#error Please set wxUSE_GLCANVAS to 1 in setup.h.
+#endif
+
+#include "wx/glcanvas.h"
+
+#ifdef __WXMAC__
+#  ifdef __DARWIN__
+#    include <OpenGL/gl.h>
+#    include <OpenGL/glu.h>
+#  else
+#    include <gl.h>
+#    include <glu.h>
+#  endif
+#else
+#  include <GL/gl.h>
+#  include <GL/glu.h>
+#endif
+
+#ifdef VIEWER_MAIN
+#define global_3d
+#else
+#define global_3d extern
+#endif
+
+#include "pcbstruct.h"
+#include "3d_struct.h"
+
+#define LIB3D_PATH wxT("packages3d/")
+
+class Pcb3D_GLCanvas;
+class WinEDA3D_DrawFrame;
+class Info_3D_Visu;
+class S3D_Vertex;
+class SEGVIA;
+
+
+#define m_ROTX m_Rot[0]
+#define m_ROTY m_Rot[1]
+#define m_ROTZ m_Rot[2]
+
+/* information needed to display 3D board */
+class Info_3D_Visu
+{
+public:
+    float m_Beginx, m_Beginy;	/* position of mouse */
+    float m_Quat[4];			/* orientation of object */
+    float m_Rot[4];				/* man rotation of object */
+    float m_Zoom;				/* field of view in degrees */
+	S3D_Color m_BgColor;
+	wxPoint m_BoardPos;
+	wxSize m_BoardSize;
+	int m_Layers;
+	EDA_BoardDesignSettings * m_BoardSettings;	// Link to current board design settings
+	float m_Epoxy_Width;		/* Epoxy tickness (normalized) */
+
+	float m_BoardScale;			/* Normalisation scale for coordinates:
+								when scaled tey are between -1.0 and +1.0 */
+	float m_LayerZcoord[32];
+public:
+	Info_3D_Visu(void);
+	~Info_3D_Visu(void);
+};
+
+
+class Pcb3D_GLCanvas: public wxGLCanvas
+{
+public:
+	WinEDA3D_DrawFrame * m_Parent;
+
+private:
+	bool   m_init;
+	GLuint m_gllist;
+
+public:
+	Pcb3D_GLCanvas(WinEDA3D_DrawFrame *parent, const wxWindowID id = -1,
+			int* gl_attrib = NULL);
+	~Pcb3D_GLCanvas(void);
+
+	void ClearLists(void);
+
+	void OnPaint(wxPaintEvent& event);
+	void OnSize(wxSizeEvent& event);
+	void OnEraseBackground(wxEraseEvent& event);
+	void OnChar(wxKeyEvent& event);
+	void OnMouseEvent(wxMouseEvent& event);
+	void OnRightClick(wxMouseEvent& event);
+	void OnPopUpMenu(wxCommandEvent & event);
+	void TakeScreenshot(wxCommandEvent & event);
+	void SetView3D(int keycode);
+	void DisplayStatus(void);
+	void Redraw(void);
+	GLuint DisplayCubeforTest(void);
+
+	void OnEnterWindow( wxMouseEvent& event );
+
+	void Render( void );
+	GLuint CreateDrawGL_List(void);
+	void InitGL(void);
+	void SetLights(void);
+	void Draw3D_Track(TRACK * track);
+	void Draw3D_Via(SEGVIA * via);
+	void Draw3D_DrawSegment(DRAWSEGMENT * segment);
+
+DECLARE_EVENT_TABLE()
+};
+
+
+class WinEDA3D_DrawFrame: public wxFrame
+{
+public:
+	WinEDA_BasePcbFrame * m_Parent;
+	WinEDA_App * m_ParentAppl;
+    Pcb3D_GLCanvas * m_Canvas;
+	wxToolBar * m_HToolBar;
+	wxToolBar * m_VToolBar;
+	int m_InternalUnits;
+	wxPoint m_FramePos;
+	wxSize m_FrameSize;
+
+private:
+	wxString m_FrameName;		// name used for writting and reading setup
+								// It is "Frame3D"
+	
+
+public:
+	WinEDA3D_DrawFrame(WinEDA_BasePcbFrame * parent, WinEDA_App *app_parent,
+		const wxString& title );
+
+    void Exit3DFrame(wxCommandEvent& event);
+	void OnCloseWindow(wxCloseEvent & Event);
+	void ReCreateMenuBar(void);
+	void ReCreateHToolbar(void);
+	void ReCreateVToolbar(void);
+	void SetToolbars(void);
+	void GetSettings(void);
+	void SaveSettings(void);
+
+	void OnLeftClick(wxDC * DC, const wxPoint& MousePos);
+	void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu);
+	void OnKeyEvent(wxKeyEvent& event);
+	int BestZoom(void);	// Retourne le meilleur zoom
+	void RedrawActiveWindow(wxDC * DC, bool EraseBg);
+	void Process_Special_Functions(wxCommandEvent& event);
+	void Process_Zoom(wxCommandEvent& event);
+
+	void NewDisplay(void);
+	void Set3DBgColor(void);
+
+DECLARE_EVENT_TABLE()
+};
+
+void SetGLColor(int color);
+void Set_Object_Data(const S3D_Vertex * coord, int nbcoord );
+
+global_3d  Info_3D_Visu g_Parm_3D_Visu;
+global_3d double g_Draw3d_dx, g_Draw3d_dy;
+global_3d double ZBottom, ZTop;
+global_3d double DataScale3D;		// coeff de conversion unites utilsateut -> unites 3D
+global_3d int gl_attrib[]
+#ifdef VIEWER_MAIN
+= { WX_GL_RGBA, WX_GL_MIN_RED, 8, WX_GL_MIN_GREEN, 8,
+            WX_GL_MIN_BLUE, 8, WX_GL_DEPTH_SIZE, 16,
+            WX_GL_DOUBLEBUFFER,
+			GL_NONE }
+#endif
+;
+
+

3d-viewer/bitmaps3d.h

@@ -1,15 +1,15 @@
-#include "bitmaps3d/import3d.xpm"
-
-#include "bitmaps3d/rotate+x.xpm"
-#include "bitmaps3d/rotate-x.xpm"
-#include "bitmaps3d/rotate+y.xpm"
-#include "bitmaps3d/rotate-y.xpm"
-#include "bitmaps3d/rotate+z.xpm"
-#include "bitmaps3d/rotate-z.xpm"
-#include "bitmaps3d/axis3d.xpm"
-#include "bitmaps3d/axis3d_bottom.xpm"
-#include "bitmaps3d/axis3d_top.xpm"
-#include "bitmaps3d/axis3d_left.xpm"
-#include "bitmaps3d/axis3d_right.xpm"
-#include "bitmaps3d/axis3d_front.xpm"
-#include "bitmaps3d/axis3d_back.xpm"
+#include "bitmaps3d/import3d.xpm"
+
+#include "bitmaps3d/rotate+x.xpm"
+#include "bitmaps3d/rotate-x.xpm"
+#include "bitmaps3d/rotate+y.xpm"
+#include "bitmaps3d/rotate-y.xpm"
+#include "bitmaps3d/rotate+z.xpm"
+#include "bitmaps3d/rotate-z.xpm"
+#include "bitmaps3d/axis3d.xpm"
+#include "bitmaps3d/axis3d_bottom.xpm"
+#include "bitmaps3d/axis3d_top.xpm"
+#include "bitmaps3d/axis3d_left.xpm"
+#include "bitmaps3d/axis3d_right.xpm"
+#include "bitmaps3d/axis3d_front.xpm"
+#include "bitmaps3d/axis3d_back.xpm"

3d-viewer/bitmaps3d/axis3d.xpm

@@ -1,27 +1,27 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char * axis3d_xpm[];
-
-#else
-char * axis3d_xpm[] = {
-"16 15 3 1",
-"   c None",
-".	c Blue",
-"x	c Red",
-"    .           ",
-"   ...          ",
-"    .           ",
-"    .           ",
-"    .           ",
-"    .           ",
-"    .         . ",
-"    ............",
-"   .          . ",
-"   .            ",
-"  .             ",
-"  .             ",
-" ..             ",
-" .              ",
-"                "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char * axis3d_xpm[];
+
+#else
+char * axis3d_xpm[] = {
+"16 15 3 1",
+"   c None",
+".	c Blue",
+"x	c Red",
+"    .           ",
+"   ...          ",
+"    .           ",
+"    .           ",
+"    .           ",
+"    .           ",
+"    .         . ",
+"    ............",
+"   .          . ",
+"   .            ",
+"  .             ",
+"  .             ",
+" ..             ",
+" .              ",
+"                "
+};
+#endif

3d-viewer/bitmaps3d/axis3d_back.xpm

@@ -1,27 +1,27 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char * axis3d_back_xpm[];
-
-#else
-char * axis3d_back_xpm[] = {
-"16 15 3 1",
-"   c None",
-".	c Blue",
-"x	c Red",
-"    .       x   ",
-"   ...      x   ",
-"    .      x    ",
-"    .    xxxxx  ",
-"    .    xxx    ",
-"    .     x     ",
-"    .         . ",
-"    ............",
-"   .          . ",
-"   .            ",
-"  .             ",
-"  .             ",
-" ..             ",
-" .              ",
-"                "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char * axis3d_back_xpm[];
+
+#else
+char * axis3d_back_xpm[] = {
+"16 15 3 1",
+"   c None",
+".	c Blue",
+"x	c Red",
+"    .       x   ",
+"   ...      x   ",
+"    .      x    ",
+"    .    xxxxx  ",
+"    .    xxx    ",
+"    .     x     ",
+"    .         . ",
+"    ............",
+"   .          . ",
+"   .            ",
+"  .             ",
+"  .             ",
+" ..             ",
+" .              ",
+"                "
+};
+#endif

3d-viewer/bitmaps3d/axis3d_bottom.xpm

@@ -1,27 +1,27 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char * axis3d_bottom_xpm[];
-
-#else
-char * axis3d_bottom_xpm[] = {
-"16 15 3 1",
-"   c None",
-".	c Blue",
-"x	c Red",
-"    .           ",
-"   ...          ",
-"    .           ",
-"    .           ",
-"    .           ",
-"    .           ",
-"    .         . ",
-"    ............",
-"   .          . ",
-"   .    x       ",
-"  .    xxx      ",
-"  .   xxxxx     ",
-" ..     x       ",
-" .      x       ",
-"        x       "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char * axis3d_bottom_xpm[];
+
+#else
+char * axis3d_bottom_xpm[] = {
+"16 15 3 1",
+"   c None",
+".	c Blue",
+"x	c Red",
+"    .           ",
+"   ...          ",
+"    .           ",
+"    .           ",
+"    .           ",
+"    .           ",
+"    .         . ",
+"    ............",
+"   .          . ",
+"   .    x       ",
+"  .    xxx      ",
+"  .   xxxxx     ",
+" ..     x       ",
+" .      x       ",
+"        x       "
+};
+#endif

3d-viewer/bitmaps3d/axis3d_front.xpm

@@ -1,27 +1,27 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char * axis3d_front_xpm[];
-
-#else
-char * axis3d_front_xpm[] = {
-"16 15 3 1",
-"   c None",
-".	c Blue",
-"x	c Red",
-"    .           ",
-"   ...          ",
-"    .           ",
-"    .           ",
-"    .           ",
-"    .           ",
-"    .         . ",
-"    ............",
-"   .   x      . ",
-"   .  xxx       ",
-"  . xxxxx       ",
-"  .   x         ",
-" ..  x          ",
-" .   x          ",
-"                "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char * axis3d_front_xpm[];
+
+#else
+char * axis3d_front_xpm[] = {
+"16 15 3 1",
+"   c None",
+".	c Blue",
+"x	c Red",
+"    .           ",
+"   ...          ",
+"    .           ",
+"    .           ",
+"    .           ",
+"    .           ",
+"    .         . ",
+"    ............",
+"   .   x      . ",
+"   .  xxx       ",
+"  . xxxxx       ",
+"  .   x         ",
+" ..  x          ",
+" .   x          ",
+"                "
+};
+#endif

3d-viewer/bitmaps3d/axis3d_left.xpm

@@ -1,27 +1,27 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char * axis3d_left_xpm[];
-
-#else
-char * axis3d_left_xpm[] = {
-"16 15 3 1",
-"   c None",
-".	c Blue",
-"x	c Red",
-"    .           ",
-"   ...          ",
-"    .           ",
-"    .           ",
-"   x.           ",
-"   xx           ",
-"xxxxxx        . ",
-"   xx...........",
-"   x          . ",
-"   .            ",
-"  .             ",
-"  .             ",
-" ..             ",
-" .              ",
-"                "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char * axis3d_left_xpm[];
+
+#else
+char * axis3d_left_xpm[] = {
+"16 15 3 1",
+"   c None",
+".	c Blue",
+"x	c Red",
+"    .           ",
+"   ...          ",
+"    .           ",
+"    .           ",
+"   x.           ",
+"   xx           ",
+"xxxxxx        . ",
+"   xx...........",
+"   x          . ",
+"   .            ",
+"  .             ",
+"  .             ",
+" ..             ",
+" .              ",
+"                "
+};
+#endif

3d-viewer/bitmaps3d/axis3d_right.xpm

@@ -1,27 +1,27 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char * axis3d_right_xpm[];
-
-#else
-char * axis3d_right_xpm[] = {
-"16 15 3 1",
-"   c None",
-".	c Blue",
-"x	c Red",
-"    .           ",
-"   ...          ",
-"    .           ",
-"    .           ",
-"    .       x   ",
-"    .      xx   ",
-"    .     xxxxxx",
-"    .......xx...",
-"   .        x . ",
-"   .            ",
-"  .             ",
-"  .             ",
-" ..             ",
-" .              ",
-"                "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char * axis3d_right_xpm[];
+
+#else
+char * axis3d_right_xpm[] = {
+"16 15 3 1",
+"   c None",
+".	c Blue",
+"x	c Red",
+"    .           ",
+"   ...          ",
+"    .           ",
+"    .           ",
+"    .       x   ",
+"    .      xx   ",
+"    .     xxxxxx",
+"    .......xx...",
+"   .        x . ",
+"   .            ",
+"  .             ",
+"  .             ",
+" ..             ",
+" .              ",
+"                "
+};
+#endif

3d-viewer/bitmaps3d/axis3d_top.xpm

@@ -1,27 +1,27 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char * axis3d_top_xpm[];
-
-#else
-char * axis3d_top_xpm[] = {
-"16 15 3 1",
-"   c None",
-".	c Blue",
-"x	c Red",
-"    .     x     ",
-"   ...    x     ",
-"    .     x     ",
-"    .   xxxxx   ",
-"    .    xxx    ",
-"    .     x     ",
-"    .         . ",
-"    ............",
-"   .          . ",
-"   .            ",
-"  .             ",
-"  .             ",
-" ..             ",
-" .              ",
-"                "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char * axis3d_top_xpm[];
+
+#else
+char * axis3d_top_xpm[] = {
+"16 15 3 1",
+"   c None",
+".	c Blue",
+"x	c Red",
+"    .     x     ",
+"   ...    x     ",
+"    .     x     ",
+"    .   xxxxx   ",
+"    .    xxx    ",
+"    .     x     ",
+"    .         . ",
+"    ............",
+"   .          . ",
+"   .            ",
+"  .             ",
+"  .             ",
+" ..             ",
+" .              ",
+"                "
+};
+#endif

3d-viewer/bitmaps3d/import3d.xpm

@@ -1,48 +1,48 @@
-/* XPM bitmap */
-#ifndef XPM_3D_MAIN
-extern char *import3d_xpm[];
-
-#else
-char *import3d_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"- c Black",
-"X c None",
-"o c Green",
-
-/* pixels */
-"XXXXXXXXXXXXXXXX",
-"----------------",
-"-oooooooooooooo-",
-"X-oooooooooooo-X",
-"X-oooooooooooo-X",
-"XX-oooooooooo-XX",
-"XX-oooooooooo-XX",
-"----oooooooo----",
-"X-oooooooooooo-X",
-"XX-oooooooooo-XX",
-"XXX-oooooooo-XXX",
-"XXXX-oooooo-XXXX",
-"XXXXX-oooo-XXXXX",
-"XXXXXX-oo-XXXXXX",
-"XXXXXXX--XXXXXXX"
-
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXX"
-
-};
-#endif
-
+/* XPM bitmap */
+#ifndef XPM_3D_MAIN
+extern char *import3d_xpm[];
+
+#else
+char *import3d_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"- c Black",
+"X c None",
+"o c Green",
+
+/* pixels */
+"XXXXXXXXXXXXXXXX",
+"----------------",
+"-oooooooooooooo-",
+"X-oooooooooooo-X",
+"X-oooooooooooo-X",
+"XX-oooooooooo-XX",
+"XX-oooooooooo-XX",
+"----oooooooo----",
+"X-oooooooooooo-X",
+"XX-oooooooooo-XX",
+"XXX-oooooooo-XXX",
+"XXXX-oooooo-XXXX",
+"XXXXX-oooo-XXXXX",
+"XXXXXX-oo-XXXXXX",
+"XXXXXXX--XXXXXXX"
+
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXX"
+
+};
+#endif
+

3d-viewer/bitmaps3d/rotate+x.xpm

@@ -1,32 +1,32 @@
-/* XPM */
-#ifndef XPM_3D_MAIN
-extern char *rotate_pos_X_xpm[];
-
-#else
-char *rotate_pos_X_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        4            1",
-/* colors */
-". c #000080",
-"# c #c0c0c0",
-"a c #808080",
-"o c #008000",
-/* pixels */
-"##oo###oo#######",
-"###oo#oo########",
-"####ooo#########",
-"###oo#oo########",
-"##oo###oo...a###",
-"##.###...###.a##",
-"##..#.#######.##",
-"##...########.##",
-"##....#######.##",
-"##.....#####.a##",
-"###########a.###",
-"################",
-"################",
-"################",
-"################"
-};
-
-#endif
+/* XPM */
+#ifndef XPM_3D_MAIN
+extern char *rotate_pos_X_xpm[];
+
+#else
+char *rotate_pos_X_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        4            1",
+/* colors */
+". c #000080",
+"# c #c0c0c0",
+"a c #808080",
+"o c #008000",
+/* pixels */
+"##oo###oo#######",
+"###oo#oo########",
+"####ooo#########",
+"###oo#oo########",
+"##oo###oo...a###",
+"##.###...###.a##",
+"##..#.#######.##",
+"##...########.##",
+"##....#######.##",
+"##.....#####.a##",
+"###########a.###",
+"################",
+"################",
+"################",
+"################"
+};
+
+#endif

3d-viewer/bitmaps3d/rotate+y.xpm

@@ -1,32 +1,32 @@
-/* XPM */
-#ifndef XPM_3D_MAIN
-extern char *rotate_pos_Y_xpm[];
-
-#else
-char *rotate_pos_Y_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        4            1",
-/* colors */
-". c #000080",
-"# c #c0c0c0",
-"a c #808080",
-"o c #FF0000",
-/* pixels */
-"##oo###oo#######",
-"###oo#oo########",
-"####ooo#########",
-"####oo##########",
-"o##oo...########",
-"#oo.####..###.##",
-"##.#######.#..##",
-"##.########...##",
-"##.#######....##",
-"##a.#####.....##",
-"###.a###########",
-"################",
-"################",
-"################",
-"################"
-};
-#endif
-
+/* XPM */
+#ifndef XPM_3D_MAIN
+extern char *rotate_pos_Y_xpm[];
+
+#else
+char *rotate_pos_Y_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        4            1",
+/* colors */
+". c #000080",
+"# c #c0c0c0",
+"a c #808080",
+"o c #FF0000",
+/* pixels */
+"##oo###oo#######",
+"###oo#oo########",
+"####ooo#########",
+"####oo##########",
+"o##oo...########",
+"#oo.####..###.##",
+"##.#######.#..##",
+"##.########...##",
+"##.#######....##",
+"##a.#####.....##",
+"###.a###########",
+"################",
+"################",
+"################",
+"################"
+};
+#endif
+

3d-viewer/bitmaps3d/rotate+z.xpm

@@ -1,32 +1,32 @@
-/* XPM */
-#ifndef XPM_3D_MAIN
-extern char *rotate_pos_Z_xpm[];
-
-#else
-char *rotate_pos_Z_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        4            1",
-/* colors */
-". c #000080",
-"# c #c0c0c0",
-"a c #808080",
-"o c #008000",
-/* pixels */
-"###oooooo#######",
-"######oo########",
-"#####oo#########",
-"####oo##########",
-"###oooooo...a###",
-"##.###..####.a##",
-"##..#.#######.##",
-"##...########.##",
-"##....#######.##",
-"##.....#####.a##",
-"###########a.###",
-"################",
-"################",
-"################",
-"################"
-};
-
-#endif
+/* XPM */
+#ifndef XPM_3D_MAIN
+extern char *rotate_pos_Z_xpm[];
+
+#else
+char *rotate_pos_Z_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        4            1",
+/* colors */
+". c #000080",
+"# c #c0c0c0",
+"a c #808080",
+"o c #008000",
+/* pixels */
+"###oooooo#######",
+"######oo########",
+"#####oo#########",
+"####oo##########",
+"###oooooo...a###",
+"##.###..####.a##",
+"##..#.#######.##",
+"##...########.##",
+"##....#######.##",
+"##.....#####.a##",
+"###########a.###",
+"################",
+"################",
+"################",
+"################"
+};
+
+#endif

3d-viewer/bitmaps3d/rotate-x.xpm

@@ -1,32 +1,32 @@
-/* XPM */
-#ifndef XPM_3D_MAIN
-extern char *rotate_neg_X_xpm[];
-
-#else
-char *rotate_neg_X_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        4            1",
-/* colors */
-". c #000080",
-"# c #c0c0c0",
-"a c #808080",
-"o c #004000",
-/* pixels */
-"##oo###oo#######",
-"###oo#oo########",
-"####ooo#########",
-"###oo#oo########",
-"##oo...oo#######",
-"##a.####..###.##",
-"##.#######.#..##",
-"##.########...##",
-"##.#######....##",
-"##a.#####.....##",
-"###.a###########",
-"################",
-"################",
-"################",
-"################"
-};
-#endif
-
+/* XPM */
+#ifndef XPM_3D_MAIN
+extern char *rotate_neg_X_xpm[];
+
+#else
+char *rotate_neg_X_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        4            1",
+/* colors */
+". c #000080",
+"# c #c0c0c0",
+"a c #808080",
+"o c #004000",
+/* pixels */
+"##oo###oo#######",
+"###oo#oo########",
+"####ooo#########",
+"###oo#oo########",
+"##oo...oo#######",
+"##a.####..###.##",
+"##.#######.#..##",
+"##.########...##",
+"##.#######....##",
+"##a.#####.....##",
+"###.a###########",
+"################",
+"################",
+"################",
+"################"
+};
+#endif
+

3d-viewer/bitmaps3d/rotate-y.xpm

@@ -1,32 +1,32 @@
-/* XPM */
-#ifndef XPM_3D_MAIN
-extern char *rotate_neg_Y_xpm[];
-
-#else
-char *rotate_neg_Y_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        4            1",
-/* colors */
-". c #000080",
-"# c #c0c0c0",
-"a c #808080",
-"o c #FF0000",
-/* pixels */
-"##oo###oo#######",
-"###oo#oo########",
-"####ooo#########",
-"####oo##########",
-"o##oo###....a###",
-"#oo###..####.a##",
-"##..#.#######.##",
-"##...########.##",
-"##....#######.##",
-"##.....#####.a##",
-"###########a.###",
-"################",
-"################",
-"################",
-"################"
-};
-
-#endif
+/* XPM */
+#ifndef XPM_3D_MAIN
+extern char *rotate_neg_Y_xpm[];
+
+#else
+char *rotate_neg_Y_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        4            1",
+/* colors */
+". c #000080",
+"# c #c0c0c0",
+"a c #808080",
+"o c #FF0000",
+/* pixels */
+"##oo###oo#######",
+"###oo#oo########",
+"####ooo#########",
+"####oo##########",
+"o##oo###....a###",
+"#oo###..####.a##",
+"##..#.#######.##",
+"##...########.##",
+"##....#######.##",
+"##.....#####.a##",
+"###########a.###",
+"################",
+"################",
+"################",
+"################"
+};
+
+#endif

3d-viewer/bitmaps3d/rotate-z.xpm

@@ -1,32 +1,32 @@
-/* XPM */
-#ifndef XPM_3D_MAIN
-extern char *rotate_neg_Z_xpm[];
-
-#else
-char *rotate_neg_Z_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        4            1",
-/* colors */
-". c #000080",
-"# c #c0c0c0",
-"a c #808080",
-"o c #008000",
-/* pixels */
-"###oooooo#######",
-"######oo########",
-"#####oo#########",
-"####oo##########",
-"###oooooo#######",
-"##a.####..###.##",
-"##.#######.#..##",
-"##.########...##",
-"##.#######....##",
-"##a.#####.....##",
-"###.a###########",
-"################",
-"################",
-"################",
-"################"
-};
-#endif
-
+/* XPM */
+#ifndef XPM_3D_MAIN
+extern char *rotate_neg_Z_xpm[];
+
+#else
+char *rotate_neg_Z_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        4            1",
+/* colors */
+". c #000080",
+"# c #c0c0c0",
+"a c #808080",
+"o c #008000",
+/* pixels */
+"###oooooo#######",
+"######oo########",
+"#####oo#########",
+"####oo##########",
+"###oooooo#######",
+"##a.####..###.##",
+"##.#######.#..##",
+"##.########...##",
+"##.#######....##",
+"##a.#####.....##",
+"###.a###########",
+"################",
+"################",
+"################",
+"################"
+};
+#endif
+

3d-viewer/bitmaps3d/zoomoins3d.xpm

@@ -1,28 +1,28 @@
-/* XPM bitmap */
-#ifndef XPMMAIN
-extern char * zoomoins3d_xpm[];
-
-#else
-char * zoomoins3d_xpm[] = {
-"16 16 3 1",
-"   c None",
-".	c Black",
-"X	c Gray100",
-"    ....        ",
-"  ..XXXX..      ",
-" .XXXXXXXX.     ",
-" .XXXXXXXX.     ",
-".XXXXXXXXXX.    ",
-".XX......XX.    ",
-".XX......XX.    ",
-".XXXXXXXXXX.    ",
-" .XXXXXXXX.     ",
-" .XXXXXXXX.     ",
-"  ..XXXX...     ",
-"    .... ...    ",
-"          ...   ",
-"           ...  ",
-"            ... ",
-"             .. "
-};
-#endif
+/* XPM bitmap */
+#ifndef XPMMAIN
+extern char * zoomoins3d_xpm[];
+
+#else
+char * zoomoins3d_xpm[] = {
+"16 16 3 1",
+"   c None",
+".	c Black",
+"X	c Gray100",
+"    ....        ",
+"  ..XXXX..      ",
+" .XXXXXXXX.     ",
+" .XXXXXXXX.     ",
+".XXXXXXXXXX.    ",
+".XX......XX.    ",
+".XX......XX.    ",
+".XXXXXXXXXX.    ",
+" .XXXXXXXX.     ",
+" .XXXXXXXX.     ",
+"  ..XXXX...     ",
+"    .... ...    ",
+"          ...   ",
+"           ...  ",
+"            ... ",
+"             .. "
+};
+#endif

3d-viewer/bitmaps3d/zoompage3d.xpm

@@ -1,32 +1,32 @@
-/* XPM bitmap */
-#ifndef XPMMAIN
-extern char * zoompage3d_xpm[];
-
-#else
-char *zoompage3d_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 5 1",
-"  c Black",
-". c None",
-"X c Gray100",
-"o c #808080",
-"O c Cyan",
-/* pixels */
-"         .......",
-" XXXXXXX  ......",
-" XXXXXXX . .....",
-" XXXXXXX    ....",
-" XXXXXXXXXX ....",
-" XXXXXXX    ....",
-" XXXXXX o..o ...",
-" XXXXX oOO.oo ..",
-" XXXXX .O..o. ..",
-" XXXXX ....o. ..",
-" XXXXX o..Ooo ..",
-" XXXXXX o..o o..",
-" XXXXXXX    o  .",
-" XXXXXXXXXX .   ",
-"            ..  "
-};
-#endif
-
+/* XPM bitmap */
+#ifndef XPMMAIN
+extern char * zoompage3d_xpm[];
+
+#else
+char *zoompage3d_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 5 1",
+"  c Black",
+". c None",
+"X c Gray100",
+"o c #808080",
+"O c Cyan",
+/* pixels */
+"         .......",
+" XXXXXXX  ......",
+" XXXXXXX . .....",
+" XXXXXXX    ....",
+" XXXXXXXXXX ....",
+" XXXXXXX    ....",
+" XXXXXX o..o ...",
+" XXXXX oOO.oo ..",
+" XXXXX .O..o. ..",
+" XXXXX ....o. ..",
+" XXXXX o..Ooo ..",
+" XXXXXX o..o o..",
+" XXXXXXX    o  .",
+" XXXXXXXXXX .   ",
+"            ..  "
+};
+#endif
+

3d-viewer/bitmaps3d/zoomplus3d.xpm

@@ -1,29 +1,29 @@
-/* XPM bitmap */
-#ifndef XPMMAIN
-extern char * zoomplus3d_xpm[];
-
-#else
-char * zoomplus3d_xpm[] = {
-"16 16 3 1",
-"   c None",
-".	c Black",
-"X	c Gray100",
-"    ....        ",
-"  ..XXXX..      ",
-" .XXXXXXXX.     ",
-" .XXX..XXX.     ",
-".XXXX..XXXX.    ",
-".XX......XX.    ",
-".XX......XX.    ",
-".XXXX..XXXX.    ",
-" .XXX..XXX.     ",
-" .XXXXXXXX.     ",
-"  ..XXXX...     ",
-"    .... ...    ",
-"          ...   ",
-"           ...  ",
-"            ... ",
-"             .. "
-};
-#endif
-
+/* XPM bitmap */
+#ifndef XPMMAIN
+extern char * zoomplus3d_xpm[];
+
+#else
+char * zoomplus3d_xpm[] = {
+"16 16 3 1",
+"   c None",
+".	c Black",
+"X	c Gray100",
+"    ....        ",
+"  ..XXXX..      ",
+" .XXXXXXXX.     ",
+" .XXX..XXX.     ",
+".XXXX..XXXX.    ",
+".XX......XX.    ",
+".XX......XX.    ",
+".XXXX..XXXX.    ",
+" .XXX..XXX.     ",
+" .XXXXXXXX.     ",
+"  ..XXXX...     ",
+"    .... ...    ",
+"          ...   ",
+"           ...  ",
+"            ... ",
+"             .. "
+};
+#endif
+