From ca9eb71087985f8b0e5829e9b869a05406d21a57 Mon Sep 17 00:00:00 2001 From: hikerstk Date: Fri, 16 Apr 2010 00:01:25 +0000 Subject: [PATCH] Removed unused file coord.hpp. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5204 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/Makefile.am | 1 - src/graphics/camera.cpp | 1 - src/graphics/skid_marks.cpp | 1 - src/graphics/skid_marks.hpp | 1 - src/ide/vc9/supertuxkart.vcproj | 4 -- src/items/item.cpp | 1 - src/items/item.hpp | 1 - src/karts/moveable.cpp | 2 - src/physics/physical_object.cpp | 1 - src/utils/coord.hpp | 95 --------------------------------- 10 files changed, 108 deletions(-) delete mode 100644 src/utils/coord.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 42a956f59..aca619e3f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -336,7 +336,6 @@ supertuxkart_SOURCES = \ tracks/track_object_manager.hpp \ utils/constants.hpp \ utils/constants.cpp \ - utils/coord.hpp \ utils/no_copy.hpp \ utils/ptr_vector.hpp \ utils/random_generator.cpp \ diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp index be351e8a6..be715ca51 100644 --- a/src/graphics/camera.cpp +++ b/src/graphics/camera.cpp @@ -30,7 +30,6 @@ #include "race/race_manager.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" -#include "utils/coord.hpp" Camera::Camera(int camera_index, const Kart* kart) { diff --git a/src/graphics/skid_marks.cpp b/src/graphics/skid_marks.cpp index 6b61094c1..935e83461 100644 --- a/src/graphics/skid_marks.cpp +++ b/src/graphics/skid_marks.cpp @@ -22,7 +22,6 @@ #include "graphics/irr_driver.hpp" #include "karts/kart.hpp" #include "physics/btKart.hpp" -#include "utils/coord.hpp" float SkidMarks::m_avoid_z_fighting = 0.0f; const int SkidMarks::m_start_alpha = 128; diff --git a/src/graphics/skid_marks.hpp b/src/graphics/skid_marks.hpp index 1a9b076cb..14718ba4e 100644 --- a/src/graphics/skid_marks.hpp +++ b/src/graphics/skid_marks.hpp @@ -27,7 +27,6 @@ using namespace irr; #include "utils/vec3.hpp" -class Coord; class Kart; /** This class is responsible for drawing skid marks for a kart. */ diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj index ba44fafc6..d3c1d11b2 100644 --- a/src/ide/vc9/supertuxkart.vcproj +++ b/src/ide/vc9/supertuxkart.vcproj @@ -1106,10 +1106,6 @@ RelativePath="..\..\utils\constants.hpp" > - - diff --git a/src/items/item.cpp b/src/items/item.cpp index 04f9b3a5a..b9159d5a1 100644 --- a/src/items/item.cpp +++ b/src/items/item.cpp @@ -22,7 +22,6 @@ #include "graphics/irr_driver.hpp" #include "karts/kart.hpp" #include "utils/constants.hpp" -#include "utils/coord.hpp" #include "utils/vec3.hpp" Item::Item(ItemType type, const Vec3& xyz, const Vec3& normal, diff --git a/src/items/item.hpp b/src/items/item.hpp index 7b551bac8..e4b0066c6 100644 --- a/src/items/item.hpp +++ b/src/items/item.hpp @@ -24,7 +24,6 @@ using namespace irr; #include "karts/kart.hpp" -#include "utils/coord.hpp" // ----------------------------------------------------------------------------- class Item diff --git a/src/karts/moveable.cpp b/src/karts/moveable.cpp index 27d7821b1..8ccc60db9 100644 --- a/src/karts/moveable.cpp +++ b/src/karts/moveable.cpp @@ -24,7 +24,6 @@ #include "graphics/irr_driver.hpp" #include "graphics/material.hpp" #include "graphics/material_manager.hpp" -#include "utils/coord.hpp" Moveable::Moveable() { @@ -87,7 +86,6 @@ void Moveable::reset() } m_node->setVisible(true); // In case that the objects was eliminated - Coord c(m_transform); m_hpr.setHPR(m_transform.getRotation()); Vec3 up = getTrans().getBasis().getColumn(1); m_pitch = atan2(up.getZ(), fabsf(up.getY())); diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp index ff0679a66..1e4b58f07 100644 --- a/src/physics/physical_object.cpp +++ b/src/physics/physical_object.cpp @@ -32,7 +32,6 @@ using namespace irr; #include "modes/world.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" -#include "utils/coord.hpp" #include "utils/string_utils.hpp" // ----------------------------------------------------------------------------- diff --git a/src/utils/coord.hpp b/src/utils/coord.hpp deleted file mode 100644 index 1fcfa5242..000000000 --- a/src/utils/coord.hpp +++ /dev/null @@ -1,95 +0,0 @@ -// $Id: vec3.hpp 1954 2008-05-20 10:01:26Z scifly $ -// -// SuperTuxKart - a fun racing game with go-kart -// Copyright (C) 2008 Joerg Henrichs -// -// 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 3 -// 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, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -#ifndef HEADER_COORD_HPP -#define HEADER_COORD_HPP - -#include "LinearMath/btTransform.h" - -#include "utils/vec3.hpp" - -/** A class that stores a translation and rotation. It is used to convert - * between bullet data structures and the data structure for the graphics. - */ -class Coord -{ -private: - /** Translation. */ - Vec3 m_xyz; - /** Rotation as Eulerian HPR value. */ - Vec3 m_hpr; - - -public: - /** Constructor. - * \param xyz Translation. - * \param hpr Rotation. - */ - Coord(const Vec3& xyz, const Vec3& hpr) - { - m_xyz = xyz; - m_hpr = hpr; - //setSgCoord(); - } // Coord - // ------------------------------------------------------------------------ - /** Constructor based on a bullet transformation (which is a translation - * and rotation as well). - * \param t The bullet transform. - */ - Coord(const btTransform& t) - { - m_xyz = t.getOrigin(); - m_hpr.setHPR(t.getRotation()); - //setSgCoord(); - } // Coord - // ------------------------------------------------------------------------ - /** Default constructor. Sets xyz and hpr to 0. */ - Coord() - { - m_xyz = Vec3(0.0f); - m_hpr = Vec3(0.0f); - } - // ------------------------------------------------------------------------ - /** Returns the translation. */ - const Vec3& getXYZ() const { return m_xyz; } - /** Returns heading, pitch, rolll. */ - const Vec3& getHPR() const { return m_hpr; } - /** Returns X. */ - float getX() const { return m_xyz.getX(); } - /** Returns Y. */ - float getY() const { return m_xyz.getY(); } - /** Returns Z. */ - float getZ() const { return m_xyz.getZ(); } - /** Returns the heading. */ - float getHeading() const { return m_hpr.getHeading(); } - - /** Sets hpr. \param a Heading, pitch and roll. */ - void setHPR(const Vec3& a) { m_hpr = a; /*setSgCoord();*/ } - /** Sets xyz. \param a Coordinates. */ - void setXYZ(const Vec3& a) { m_xyz = a; /*setSgCoord();*/ } - /** Sets X. \param x New X value. */ - void setX(float x) { m_xyz.setX(x); } - /** Sets Y. \param y New Y value. */ - void setY(float y) { m_xyz.setY(y); } - /** Sets Z. \param z New Z value. */ - void setZ(float z) { m_xyz.setZ(z); } -}; // Coord - -#endif