[gazebo] 02/04: Fixes from the merge

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch dfsg_clean
in repository gazebo.

commit f1d5879b4544b118dcec8244931f69b7d4b9be9f
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Feb 2 16:31:42 2015 +0000

    Fixes from the merge
---
 ...eshShape.hh~upstream_5.0.1 => DARTMeshShape.hh} |  0
 gazebo/physics/ode/ODEMeshShape.cc~upstream_5.0.1  | 72 ----------------------
 2 files changed, 72 deletions(-)

diff --git a/gazebo/physics/dart/DARTMeshShape.hh~upstream_5.0.1 b/gazebo/physics/dart/DARTMeshShape.hh
similarity index 100%
rename from gazebo/physics/dart/DARTMeshShape.hh~upstream_5.0.1
rename to gazebo/physics/dart/DARTMeshShape.hh
diff --git a/gazebo/physics/ode/ODEMeshShape.cc~upstream_5.0.1 b/gazebo/physics/ode/ODEMeshShape.cc~upstream_5.0.1
deleted file mode 100644
index 01cb50b..0000000
--- a/gazebo/physics/ode/ODEMeshShape.cc~upstream_5.0.1
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2012-2015 Open Source Robotics Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
-*/
-#include "gazebo/common/Mesh.hh"
-#include "gazebo/common/Assert.hh"
-#include "gazebo/common/Console.hh"
-
-#include "gazebo/physics/ode/ODEMesh.hh"
-#include "gazebo/physics/ode/ODECollision.hh"
-#include "gazebo/physics/ode/ODEPhysics.hh"
-#include "gazebo/physics/ode/ODEMeshShape.hh"
-
-using namespace gazebo;
-using namespace physics;
-
-//////////////////////////////////////////////////
-ODEMeshShape::ODEMeshShape(CollisionPtr _parent) : MeshShape(_parent)
-{
-  this->odeMesh = new ODEMesh();
-}
-
-//////////////////////////////////////////////////
-ODEMeshShape::~ODEMeshShape()
-{
-  delete this->odeMesh;
-}
-
-//////////////////////////////////////////////////
-void ODEMeshShape::Update()
-{
-  this->odeMesh->Update();
-}
-
-//////////////////////////////////////////////////
-void ODEMeshShape::Load(sdf::ElementPtr _sdf)
-{
-  MeshShape::Load(_sdf);
-}
-
-//////////////////////////////////////////////////
-void ODEMeshShape::Init()
-{
-  MeshShape::Init();
-  if (!this->mesh)
-    return;
-
-  if (this->submesh)
-  {
-    this->odeMesh->Init(this->submesh,
-        boost::static_pointer_cast<ODECollision>(this->collisionParent),
-        this->sdf->Get<math::Vector3>("scale"));
-  }
-  else
-  {
-    this->odeMesh->Init(this->mesh,
-        boost::static_pointer_cast<ODECollision>(this->collisionParent),
-        this->sdf->Get<math::Vector3>("scale"));
-  }
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git