3D-viewer: code cleanup. (0ebc3f06) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_aux.cpp

+6 −10

Original line number	Diff line number	Diff line
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
		* Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
		* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
		* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
		*
		@@ -29,10 +29,6 @@

		#include <fctsys.h>

		#if !wxUSE_GLCANVAS
		#error Please set wxUSE_GLCANVAS to 1 in setup.h.
		#endif

		#include <common.h>
		#include <trigo.h>
		#include <wxBasePcbFrame.h>
		@@ -49,7 +45,7 @@
		#include <trackball.h>


		void S3D_MASTER::Set_Object_Coords( std::vector< S3D_Vertex >& aVertices )
		void S3D_MASTER::Set_Object_Coords( std::vector< S3D_VERTEX >& aVertices )
		{
		unsigned ii;

		@@ -79,7 +75,7 @@ void S3D_MASTER::Set_Object_Coords( std::vector< S3D_Vertex >& aVertices )
		}


		void Set_Object_Data( std::vector< S3D_Vertex >& aVertices )
		void Set_Object_Data( std::vector< S3D_VERTEX >& aVertices )
		{
		unsigned ii;
		GLfloat ax, ay, az, bx, by, bz, nx, ny, nz, r;
		@@ -271,9 +267,9 @@ VERTEX_VALUE_CTRL::~VERTEX_VALUE_CTRL()
		}


		S3D_Vertex VERTEX_VALUE_CTRL::GetValue()
		S3D_VERTEX VERTEX_VALUE_CTRL::GetValue()
		{
		S3D_Vertex value;
		S3D_VERTEX value;
		double dtmp;

		m_XValueCtrl->GetValue().ToDouble( &dtmp );
		@@ -286,7 +282,7 @@ S3D_Vertex VERTEX_VALUE_CTRL::GetValue()
		}


		void VERTEX_VALUE_CTRL::SetValue( S3D_Vertex vertex )
		void VERTEX_VALUE_CTRL::SetValue( S3D_VERTEX vertex )
		{
		wxString text;

3d-viewer/3d_class.cpp

+30 −6

Original line number	Diff line number	Diff line
		/////////////////////////////////////////////////////////////////////////////
		// Name: 3d_class.cpp
		/////////////////////////////////////////////////////////////////////////////
		/**
		* @file 3d_class.cpp
		*/

		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, you may find one here:
		* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
		* or you may search the http://www.gnu.org website for the version 2 license,
		* or you may write to the Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
		*/


		#include <fctsys.h>

		@@ -55,7 +79,7 @@ S3D_MASTER::S3D_MASTER( EDA_ITEM* aParent ) :

		S3D_MASTER:: ~S3D_MASTER()
		{
		Struct3D_Shape* next;
		STRUCT_3D_SHAPE* next;
		S3D_MATERIAL* nextmat;

		for( ; m_3D_Drawings != NULL; m_3D_Drawings = next )
		@@ -72,7 +96,7 @@ S3D_MASTER:: ~S3D_MASTER()
		}


		Struct3D_Shape::Struct3D_Shape( EDA_ITEM* aParent ) :
		STRUCT_3D_SHAPE::STRUCT_3D_SHAPE( EDA_ITEM* aParent ) :
		EDA_ITEM( aParent, NOT_USED )
		{
		m_3D_Coord = NULL;
		@@ -81,7 +105,7 @@ Struct3D_Shape::Struct3D_Shape( EDA_ITEM* aParent ) :
		}


		Struct3D_Shape:: ~Struct3D_Shape()
		STRUCT_3D_SHAPE:: ~STRUCT_3D_SHAPE()
		{
		delete m_3D_Coord;
		delete m_3D_CoordIndex;

Admin message