Cleanup ModelScaleManipulator class

codereader · Jan 23, 2017 · fe45eca · fe45eca
1 parent 5e0e08c
commit fe45eca
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/radiant/selection/manipulators/ModelScaleManipulator.cpp b/radiant/selection/manipulators/ModelScaleManipulator.cpp
@@ -1,11 +1,6 @@
 #include "ModelScaleManipulator.h"
 
-#include "selection/Remap.h"
-#include "selection/BestPoint.h"
-#include "selection/BestSelector.h"
-#include "selection/SelectionTest.h"
 #include "render/View.h"
-#include "string/convert.h"
 #include "debugging/ScenegraphUtils.h"
 
 namespace selection
@@ -29,8 +24,6 @@ ModelScaleManipulator::Component* ModelScaleManipulator::getActiveComponent()
 
 void ModelScaleManipulator::testSelect(const render::View& view, const Matrix4& pivot2world)
 {
-	_pivot2World.update(_pivot.getMatrix4(), view.GetModelview(), view.GetProjection(), view.GetViewport());
-
 	_curManipulatable.reset();
 	_scaleComponent.setEntityNode(scene::INodePtr());
 	_scaleComponent.setScalePivot(Vector3(0, 0, 0));
@@ -74,8 +67,6 @@ bool ModelScaleManipulator::isSelected() const
 
 void ModelScaleManipulator::render(RenderableCollector& collector, const VolumeTest& volume)
 {
-	_pivot2World.update(_pivot.getMatrix4(), volume.GetModelview(), volume.GetProjection(), volume.GetViewport());
-
 	_renderableAabbs.clear();
 	_renderableCornerPoints.clear();
 

diff --git a/radiant/selection/manipulators/ModelScaleManipulator.h b/radiant/selection/manipulators/ModelScaleManipulator.h
@@ -25,12 +25,9 @@ class ModelScaleManipulator :
 	// Resize component
 	ModelScaleComponent _scaleComponent;
 
-	Pivot2World _pivot2World;
-
 	std::list<RenderableSolidAABB> _renderableAabbs;
 	RenderablePointVector _renderableCornerPoints;
 
-	std::map<ISelectable*, scene::INodePtr> _candidates;
 	scene::INodePtr _curManipulatable;
 
 public: