Refactored importer & input to make it clearer which methods are internal

PositionalInput renamed to Pointer (events relating to mouse cursor & touch)

BansheeEngine/Include/BsDragAndDropManager.h

@@ -40,7 +40,7 @@ namespace BansheeEngine
 		 */
 		void update();
 
-		boost::signal<bool(const PositionalInputEvent&)> onDragEnded;
+		boost::signal<bool(const PointerEvent&)> onDragEnded;
 	private:
 		UINT32 mDragTypeId;
 		void* mData;
@@ -53,6 +53,6 @@ namespace BansheeEngine
 
 		void endDrag(bool processed);
 		void mouseCaptureChanged();
-		void cursorReleased(const PositionalInputEvent& event);
+		void cursorReleased(const PointerEvent& event);
 	};
 }

BansheeEngine/Include/BsGUIManager.h

@@ -128,9 +128,9 @@ namespace BansheeEngine
 
 		Stack<GUIElement*>::type mScheduledForDestruction;
 
-		// Element and widget mouse is currently over
-		Vector<ElementInfo>::type mElementsUnderCursor;
-		Vector<ElementInfo>::type mNewElementsUnderCursor;
+		// Element and widget pointer is currently over
+		Vector<ElementInfo>::type mElementsUnderPointer;
+		Vector<ElementInfo>::type mNewElementsUnderPointer;
 
 		// Element and widget that's being clicked on
 		GUIMouseButton mActiveMouseButton;
@@ -147,10 +147,10 @@ namespace BansheeEngine
 		GUIInputSelection* mInputSelection;
 
 		bool mSeparateMeshesByWidget;
-		Vector2I mLastCursorScreenPos;
+		Vector2I mLastPointerScreenPos;
 
 		DragState mDragState;
-		Vector2I mLastCursorClickPos;
+		Vector2I mLastPointerClickPos;
 
 		GUIMouseEvent mMouseEvent;
 		GUITextInputEvent mTextInputEvent;
@@ -169,10 +169,10 @@ namespace BansheeEngine
 
 		Map<const RenderTexture*, const GUIElement*>::type mInputBridge;
 
-		boost::signals::connection mOnCursorMovedConn;
-		boost::signals::connection mOnCursorPressedConn;
-		boost::signals::connection mOnCursorReleasedConn;
-		boost::signals::connection mOnCursorDoubleClick;
+		boost::signals::connection mOnPointerMovedConn;
+		boost::signals::connection mOnPointerPressedConn;
+		boost::signals::connection mOnPointerReleasedConn;
+		boost::signals::connection mOnPointerDoubleClick;
 		boost::signals::connection mOnTextInputConn;
 		boost::signals::connection mOnInputCommandConn;
 		boost::signals::connection mOnVirtualButtonDown;
@@ -189,24 +189,24 @@ namespace BansheeEngine
 		void updateTextSelectionTexture();
 		void processDestroyQueue();
 
-		bool findElementUnderCursor(const Vector2I& screenMousePos, bool buttonStates[3], bool shift, bool control, bool alt);
+		bool findElementUnderPointer(const Vector2I& screenMousePos, bool buttonStates[3], bool shift, bool control, bool alt);
 
-		void onCursorMoved(const PositionalInputEvent& event);
-		void onCursorReleased(const PositionalInputEvent& event);
-		void onCursorPressed(const PositionalInputEvent& event);
-		void onCursorDoubleClick(const PositionalInputEvent& event);
+		void onPointerMoved(const PointerEvent& event);
+		void onPointerReleased(const PointerEvent& event);
+		void onPointerPressed(const PointerEvent& event);
+		void onPointerDoubleClick(const PointerEvent& event);
 		void onTextInput(const TextInputEvent& event);
 		void onInputCommandEntered(InputCommandType commandType);
 		void onVirtualButtonDown(const VirtualButton& button);
 
-		bool onMouseDragEnded(const PositionalInputEvent& event);
+		bool onMouseDragEnded(const PointerEvent& event);
 
 		void onWindowFocusGained(RenderWindow& win);
 		void onWindowFocusLost(RenderWindow& win);
 
 		void onMouseLeftWindow(RenderWindow* win);
 
-		GUIMouseButton buttonToGUIButton(PositionalInputEventButton cursorButton) const;
+		GUIMouseButton buttonToGUIButton(PointerEventButton pointerButton) const;
 		Vector2I getWidgetRelativePos(const GUIWidget& widget, const Vector2I& screenPos) const;
 		Vector2I windowToBridgedCoords(const GUIWidget& widget, const Vector2I& windowPos) const;
 		const RenderWindow* getWidgetWindow(const GUIWidget& widget) const;

BansheeEngine/Source/BsDragAndDropManager.cpp

@@ -10,7 +10,7 @@ namespace BansheeEngine
 		:mIsDragInProgress(false), mDragTypeId(0), mData(nullptr), mCaptureChanged(false), mCaptureActive(0), mNeedsValidDropTarget(false)
 	{
 		Platform::onMouseCaptureChanged.connect(std::bind(&DragAndDropManager::mouseCaptureChanged, this));
-		Input::instance().onCursorReleased.connect(std::bind(&DragAndDropManager::cursorReleased, this, _1));
+		Input::instance().onPointerReleased.connect(std::bind(&DragAndDropManager::cursorReleased, this, _1));
 	}
 
 	void DragAndDropManager::addDropCallback(std::function<void(bool)> dropCallback)
@@ -62,7 +62,7 @@ namespace BansheeEngine
 		mCaptureChanged.store(true);
 	}
 
-	void DragAndDropManager::cursorReleased(const PositionalInputEvent& event)
+	void DragAndDropManager::cursorReleased(const PointerEvent& event)
 	{
 		if(!mIsDragInProgress)
 			return;

BansheeEngine/Source/BsGUIManager.cpp

@@ -70,10 +70,10 @@ namespace BansheeEngine
 		mTextSelectionColor(1.0f, 0.6588f, 0.0f), mInputCaret(nullptr), mInputSelection(nullptr), mDragState(DragState::NoDrag),
 		mActiveCursor(CursorType::Arrow)
 	{
-		mOnCursorMovedConn = gInput().onCursorMoved.connect(std::bind(&GUIManager::onCursorMoved, this, _1));
-		mOnCursorPressedConn = gInput().onCursorPressed.connect(std::bind(&GUIManager::onCursorPressed, this, _1));
-		mOnCursorReleasedConn = gInput().onCursorReleased.connect(std::bind(&GUIManager::onCursorReleased, this, _1));
-		mOnCursorDoubleClick = gInput().onDoubleClick.connect(std::bind(&GUIManager::onCursorDoubleClick, this, _1));
+		mOnPointerMovedConn = gInput().onPointerMoved.connect(std::bind(&GUIManager::onPointerMoved, this, _1));
+		mOnPointerPressedConn = gInput().onPointerPressed.connect(std::bind(&GUIManager::onPointerPressed, this, _1));
+		mOnPointerReleasedConn = gInput().onPointerReleased.connect(std::bind(&GUIManager::onPointerReleased, this, _1));
+		mOnPointerDoubleClick = gInput().onPointerDoubleClick.connect(std::bind(&GUIManager::onPointerDoubleClick, this, _1));
 		mOnTextInputConn = gInput().onCharInput.connect(std::bind(&GUIManager::onTextInput, this, _1)); 
 		mOnInputCommandConn = gInput().onInputCommand.connect(std::bind(&GUIManager::onInputCommandEntered, this, _1)); 
 		mOnVirtualButtonDown = VirtualInput::instance().onButtonDown.connect(std::bind(&GUIManager::onVirtualButtonDown, this, _1));
@@ -113,10 +113,10 @@ namespace BansheeEngine
 		for(auto& widget : widgetCopy)
 			widget.widget->destroy();
 
-		mOnCursorPressedConn.disconnect();
-		mOnCursorReleasedConn.disconnect();
-		mOnCursorMovedConn.disconnect();
-		mOnCursorDoubleClick.disconnect();
+		mOnPointerPressedConn.disconnect();
+		mOnPointerReleasedConn.disconnect();
+		mOnPointerMovedConn.disconnect();
+		mOnPointerDoubleClick.disconnect();
 		mOnTextInputConn.disconnect();
 		mOnInputCommandConn.disconnect();
 		mOnVirtualButtonDown.disconnect();
@@ -206,14 +206,14 @@ namespace BansheeEngine
 
 		PROFILE_CALL(updateMeshes(), "UpdateMeshes");
 
-		mNewElementsUnderCursor.clear();
-		for(auto& elementInfo : mElementsUnderCursor)
+		mNewElementsUnderPointer.clear();
+		for(auto& elementInfo : mElementsUnderPointer)
 		{
 			if(!elementInfo.element->_isDestroyed())
-				mNewElementsUnderCursor.push_back(elementInfo);
+				mNewElementsUnderPointer.push_back(elementInfo);
 		}
 
-		mElementsUnderCursor.swap(mNewElementsUnderCursor);
+		mElementsUnderPointer.swap(mNewElementsUnderPointer);
 
 		mNewActiveElements.clear();
 		for(auto& elementInfo : mActiveElements)
@@ -615,13 +615,13 @@ namespace BansheeEngine
 		gCoreAccessor().writeSubresource(tex.getInternalPtr(), tex->mapToSubresourceIdx(0, 0), data);
 	}
 
-	bool GUIManager::onMouseDragEnded(const PositionalInputEvent& event)
+	bool GUIManager::onMouseDragEnded(const PointerEvent& event)
 	{
 		GUIMouseButton guiButton = buttonToGUIButton(event.button);
 
 		if(DragAndDropManager::instance().isDragInProgress() && guiButton == GUIMouseButton::Left)
 		{
-			for(auto& elementInfo : mElementsUnderCursor)
+			for(auto& elementInfo : mElementsUnderPointer)
 			{
 				Vector2I localPos;
 
@@ -648,7 +648,7 @@ namespace BansheeEngine
 		return false;
 	}
 
-	void GUIManager::onCursorMoved(const PositionalInputEvent& event)
+	void GUIManager::onPointerMoved(const PointerEvent& event)
 	{
 		if(event.isUsed())
 			return;
@@ -658,12 +658,12 @@ namespace BansheeEngine
 		buttonStates[1] = event.buttonStates[1];
 		buttonStates[2] = event.buttonStates[2];
 
-		if(findElementUnderCursor(event.screenPos, buttonStates, event.shift, event.control, event.alt))
+		if(findElementUnderPointer(event.screenPos, buttonStates, event.shift, event.control, event.alt))
 			event.markAsUsed();
 
 		if(mDragState == DragState::HeldWithoutDrag)
 		{
-			UINT32 dist = mLastCursorClickPos.manhattanDist(event.screenPos);
+			UINT32 dist = mLastPointerClickPos.manhattanDist(event.screenPos);
 
 			if(dist > DRAG_DISTANCE)
 			{
@@ -685,23 +685,23 @@ namespace BansheeEngine
 		{
 			for(auto& activeElement : mActiveElements)
 			{
-				if(mLastCursorScreenPos != event.screenPos)
+				if(mLastPointerScreenPos != event.screenPos)
 				{
 					Vector2I localPos = getWidgetRelativePos(*activeElement.widget, event.screenPos);
 
-					mMouseEvent.setMouseDragData(localPos, localPos - mLastCursorScreenPos);
+					mMouseEvent.setMouseDragData(localPos, localPos - mLastPointerScreenPos);
 					if(sendMouseEvent(activeElement.widget, activeElement.element, mMouseEvent))
 						event.markAsUsed();
 				}
 			}
 
-			mLastCursorScreenPos = event.screenPos;
+			mLastPointerScreenPos = event.screenPos;
 
 			// Also if drag is in progress send DragAndDrop events
 			if(DragAndDropManager::instance().isDragInProgress())
 			{
 				bool acceptDrop = true;
-				for(auto& elementInfo : mElementsUnderCursor)
+				for(auto& elementInfo : mElementsUnderPointer)
 				{
 					Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
 
@@ -742,11 +742,11 @@ namespace BansheeEngine
 		}
 		else // Otherwise, send MouseMove events if we are hovering over any element
 		{
-			if(mLastCursorScreenPos != event.screenPos)
+			if(mLastPointerScreenPos != event.screenPos)
 			{
 				bool moveProcessed = false;
 				bool hasCustomCursor = false;
-				for(auto& elementInfo : mElementsUnderCursor)
+				for(auto& elementInfo : mElementsUnderPointer)
 				{
 					Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
 
@@ -792,11 +792,11 @@ namespace BansheeEngine
 				}
 			}
 
-			mLastCursorScreenPos = event.screenPos;
+			mLastPointerScreenPos = event.screenPos;
 
 			if(Math::abs(event.mouseWheelScrollAmount) > 0.00001f)
 			{
-				for(auto& elementInfo : mElementsUnderCursor)
+				for(auto& elementInfo : mElementsUnderPointer)
 				{
 					mMouseEvent.setMouseWheelScrollData(event.mouseWheelScrollAmount);
 					if(sendMouseEvent(elementInfo.widget, elementInfo.element, mMouseEvent))
@@ -809,7 +809,7 @@ namespace BansheeEngine
 		}
 	}
 
-	void GUIManager::onCursorReleased(const PositionalInputEvent& event)
+	void GUIManager::onPointerReleased(const PointerEvent& event)
 	{
 		if(event.isUsed())
 			return;
@@ -819,7 +819,7 @@ namespace BansheeEngine
 		buttonStates[1] = event.buttonStates[1];
 		buttonStates[2] = event.buttonStates[2];
 
-		if(findElementUnderCursor(event.screenPos, buttonStates, event.shift, event.control, event.alt))
+		if(findElementUnderPointer(event.screenPos, buttonStates, event.shift, event.control, event.alt))
 			event.markAsUsed();
 
 		mMouseEvent = GUIMouseEvent(buttonStates, event.shift, event.control, event.alt);
@@ -830,7 +830,7 @@ namespace BansheeEngine
 		// And only activate when a button that originally caused the active state is released, otherwise ignore it.
 		if(mActiveMouseButton == guiButton)
 		{
-			for(auto& elementInfo : mElementsUnderCursor)
+			for(auto& elementInfo : mElementsUnderPointer)
 			{
 				auto iterFind2 = std::find_if(mActiveElements.begin(), mActiveElements.end(), 
 					[&](const ElementInfo& x) { return x.element == elementInfo.element; });
@@ -883,7 +883,7 @@ namespace BansheeEngine
 		}
 	}
 
-	void GUIManager::onCursorPressed(const PositionalInputEvent& event)
+	void GUIManager::onPointerPressed(const PointerEvent& event)
 	{
 		if(event.isUsed())
 			return;
@@ -893,7 +893,7 @@ namespace BansheeEngine
 		buttonStates[1] = event.buttonStates[1];
 		buttonStates[2] = event.buttonStates[2];
 
-		if(findElementUnderCursor(event.screenPos, buttonStates, event.shift, event.control, event.alt))
+		if(findElementUnderPointer(event.screenPos, buttonStates, event.shift, event.control, event.alt))
 			event.markAsUsed();
 
 		mMouseEvent = GUIMouseEvent(buttonStates, event.shift, event.control, event.alt);
@@ -904,7 +904,7 @@ namespace BansheeEngine
 		if(mActiveElements.size() == 0)
 		{
 			mNewActiveElements.clear();
-			for(auto& elementInfo : mElementsUnderCursor)
+			for(auto& elementInfo : mElementsUnderPointer)
 			{
 				Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
 
@@ -915,7 +915,7 @@ namespace BansheeEngine
 				if(guiButton == GUIMouseButton::Left)
 				{
 					mDragState = DragState::HeldWithoutDrag;
-					mLastCursorClickPos = event.screenPos;
+					mLastPointerClickPos = event.screenPos;
 				}
 
 				mNewActiveElements.push_back(ElementInfo(elementInfo.element, elementInfo.widget));
@@ -937,7 +937,7 @@ namespace BansheeEngine
 		// Determine elements that gained focus
 		mCommandEvent.setType(GUICommandEventType::FocusGained);
 
-		for(auto& elementInfo : mElementsUnderCursor)
+		for(auto& elementInfo : mElementsUnderPointer)
 		{
 			mNewElementsInFocus.push_back(elementInfo);
 
@@ -964,7 +964,7 @@ namespace BansheeEngine
 			}
 		}
 
-		if(mElementsUnderCursor.size() > 0)
+		if(mElementsUnderPointer.size() > 0)
 			event.markAsUsed();
 
 		mElementsInFocus.swap(mNewElementsInFocus);
@@ -972,7 +972,7 @@ namespace BansheeEngine
 		// If right click try to open context menu
 		if(buttonStates[2] == true) 
 		{
-			for(auto& elementInfo : mElementsUnderCursor)
+			for(auto& elementInfo : mElementsUnderPointer)
 			{
 				GUIContextMenu* menu = elementInfo.element->getContextMenu();
 
@@ -989,7 +989,7 @@ namespace BansheeEngine
 		}
 	}
 
-	void GUIManager::onCursorDoubleClick(const PositionalInputEvent& event)
+	void GUIManager::onPointerDoubleClick(const PointerEvent& event)
 	{
 		if(event.isUsed())
 			return;
@@ -999,7 +999,7 @@ namespace BansheeEngine
 		buttonStates[1] = event.buttonStates[1];
 		buttonStates[2] = event.buttonStates[2];
 
-		if(findElementUnderCursor(event.screenPos, buttonStates, event.shift, event.control, event.alt))
+		if(findElementUnderPointer(event.screenPos, buttonStates, event.shift, event.control, event.alt))
 			event.markAsUsed();
 
 		mMouseEvent = GUIMouseEvent(buttonStates, event.shift, event.control, event.alt);
@@ -1007,7 +1007,7 @@ namespace BansheeEngine
 		GUIMouseButton guiButton = buttonToGUIButton(event.button);
 
 		// We only check for mouse down if we are hovering over an element
-		for(auto& elementInfo : mElementsUnderCursor)
+		for(auto& elementInfo : mElementsUnderPointer)
 		{
 			Vector2I localPos = getWidgetRelativePos(*elementInfo.widget, event.screenPos);
 
@@ -1086,7 +1086,7 @@ namespace BansheeEngine
 		}
 	}
 
-	bool GUIManager::findElementUnderCursor(const Vector2I& cursorScreenPos, bool buttonStates[3], bool shift, bool control, bool alt)
+	bool GUIManager::findElementUnderPointer(const Vector2I& pointerScreenPos, bool buttonStates[3], bool shift, bool control, bool alt)
 	{
 		Vector<const RenderWindow*>::type widgetWindows;
 		for(auto& widgetInfo : mWidgets)
@@ -1110,9 +1110,9 @@ namespace BansheeEngine
 		}
 #endif
 
-		mNewElementsUnderCursor.clear();
+		mNewElementsUnderPointer.clear();
 
-		const RenderWindow* windowUnderCursor = nullptr;
+		const RenderWindow* windowUnderPointer = nullptr;
 		UnorderedSet<const RenderWindow*>::type uniqueWindows;
 
 		for(auto& window : widgetWindows)
@@ -1125,16 +1125,16 @@ namespace BansheeEngine
 
 		for(auto& window : uniqueWindows)
 		{
-			if(Platform::isPointOverWindow(*window, cursorScreenPos))
+			if(Platform::isPointOverWindow(*window, pointerScreenPos))
 			{
-				windowUnderCursor = window;
+				windowUnderPointer = window;
 				break;
 			}
 		}
 
-		if(windowUnderCursor != nullptr)
+		if(windowUnderPointer != nullptr)
 		{
-			Vector2I windowPos = windowUnderCursor->screenToWindowPos(cursorScreenPos);
+			Vector2I windowPos = windowUnderPointer->screenToWindowPos(pointerScreenPos);
 			Vector4 vecWindowPos((float)windowPos.x, (float)windowPos.y, 0.0f, 1.0f);
 
 			UINT32 widgetIdx = 0;
@@ -1147,10 +1147,10 @@ namespace BansheeEngine
 				}
 
 				GUIWidget* widget = widgetInfo.widget;
-				if(widgetWindows[widgetIdx] == windowUnderCursor && widget->inBounds(windowToBridgedCoords(*widget, windowPos)))
+				if(widgetWindows[widgetIdx] == windowUnderPointer && widget->inBounds(windowToBridgedCoords(*widget, windowPos)))
 				{
 					const Vector<GUIElement*>::type& elements = widget->getElements();
-					Vector2I localPos = getWidgetRelativePos(*widget, cursorScreenPos);
+					Vector2I localPos = getWidgetRelativePos(*widget, pointerScreenPos);
 
 					// Elements with lowest depth (most to the front) get handled first
 					for(auto iter = elements.begin(); iter != elements.end(); ++iter)
@@ -1159,7 +1159,7 @@ namespace BansheeEngine
 
 						if(!element->_isDisabled() && element->_isInBounds(localPos))
 						{
-							mNewElementsUnderCursor.push_back(ElementInfo(element, widget));
+							mNewElementsUnderPointer.push_back(ElementInfo(element, widget));
 						}
 					}
 				}
@@ -1168,7 +1168,7 @@ namespace BansheeEngine
 			}
 		}
 
-		std::sort(mNewElementsUnderCursor.begin(), mNewElementsUnderCursor.end(), 
+		std::sort(mNewElementsUnderPointer.begin(), mNewElementsUnderPointer.end(), 
 			[](const ElementInfo& a, const ElementInfo& b)
 		{
 			return a.element->_getDepth() < b.element->_getDepth();
@@ -1176,15 +1176,15 @@ namespace BansheeEngine
 
 		// Send MouseOut and MouseOver events
 		bool eventProcessed = false;
-		for(auto& elementInfo : mElementsUnderCursor)
+		for(auto& elementInfo : mElementsUnderPointer)
 		{
 			GUIElement* element = elementInfo.element;
 			GUIWidget* widget = elementInfo.widget;
 
-			auto iterFind = std::find_if(mNewElementsUnderCursor.begin(), mNewElementsUnderCursor.end(), 
+			auto iterFind = std::find_if(mNewElementsUnderPointer.begin(), mNewElementsUnderPointer.end(), 
 				[=] (const ElementInfo& x) { return x.element == element; });
 
-			if(iterFind == mNewElementsUnderCursor.end())
+			if(iterFind == mNewElementsUnderPointer.end())
 			{
 				auto iterFind2 = std::find_if(mActiveElements.begin(), mActiveElements.end(), 
 					[=](const ElementInfo& x) { return x.element == element; });
@@ -1192,24 +1192,24 @@ namespace BansheeEngine
 				// Send MouseOut event
 				if(mActiveElements.size() == 0 || iterFind2 != mActiveElements.end())
 				{
-					Vector2I curLocalPos = getWidgetRelativePos(*widget, cursorScreenPos);
+					Vector2I localPos = getWidgetRelativePos(*widget, pointerScreenPos);
 
-					mMouseEvent.setMouseOutData(curLocalPos);
+					mMouseEvent.setMouseOutData(localPos);
 					if(sendMouseEvent(widget, element, mMouseEvent))
 						eventProcessed = true;
 				}
 			}
 		}
 
-		for(auto& elementInfo : mNewElementsUnderCursor)
+		for(auto& elementInfo : mNewElementsUnderPointer)
 		{
 			GUIElement* element = elementInfo.element;
 			GUIWidget* widget = elementInfo.widget;
 
-			auto iterFind = std::find_if(begin(mElementsUnderCursor), end(mElementsUnderCursor), 
+			auto iterFind = std::find_if(begin(mElementsUnderPointer), end(mElementsUnderPointer), 
 				[=] (const ElementInfo& x) { return x.element == element; });
 
-			if(iterFind == mElementsUnderCursor.end())
+			if(iterFind == mElementsUnderPointer.end())
 			{
 				auto iterFind2 = std::find_if(mActiveElements.begin(), mActiveElements.end(), 
 					[&](const ElementInfo& x) { return x.element == element; });
@@ -1219,7 +1219,7 @@ namespace BansheeEngine
 				{
 					Vector2I localPos;
 					if(widget != nullptr)
-						localPos = getWidgetRelativePos(*widget, cursorScreenPos);
+						localPos = getWidgetRelativePos(*widget, pointerScreenPos);
 
 					mMouseEvent = GUIMouseEvent(buttonStates, shift, control, alt);
 
@@ -1230,7 +1230,7 @@ namespace BansheeEngine
 			}
 		}
 
-		mElementsUnderCursor.swap(mNewElementsUnderCursor);
+		mElementsUnderPointer.swap(mNewElementsUnderPointer);
 
 		return eventProcessed;
 	}
@@ -1292,16 +1292,16 @@ namespace BansheeEngine
 		buttonStates[1] = false;
 		buttonStates[2] = false;
 
-		mNewElementsUnderCursor.clear();
+		mNewElementsUnderPointer.clear();
 
-		for(auto& elementInfo : mElementsUnderCursor)
+		for(auto& elementInfo : mElementsUnderPointer)
 		{
 			GUIElement* element = elementInfo.element;
 			GUIWidget* widget = elementInfo.widget;
 
 			if(widget->getTarget()->getTarget().get() != win)
 			{
-				mNewElementsUnderCursor.push_back(elementInfo);
+				mNewElementsUnderPointer.push_back(elementInfo);
 				continue;
 			}
 
@@ -1318,7 +1318,7 @@ namespace BansheeEngine
 			}
 		}
 
-		mElementsUnderCursor.swap(mNewElementsUnderCursor);
+		mElementsUnderPointer.swap(mNewElementsUnderPointer);
 	}
 
 	void GUIManager::queueForDestroy(GUIElement* element)
@@ -1360,13 +1360,13 @@ namespace BansheeEngine
 			mInputBridge[renderTex] = element;
 	}
 
-	GUIMouseButton GUIManager::buttonToGUIButton(PositionalInputEventButton cursorButton) const
+	GUIMouseButton GUIManager::buttonToGUIButton(PointerEventButton pointerButton) const
 	{
-		if(cursorButton == PositionalInputEventButton::Left)
+		if(pointerButton == PointerEventButton::Left)
 			return GUIMouseButton::Left;
-		else if(cursorButton == PositionalInputEventButton::Middle)
+		else if(pointerButton == PointerEventButton::Middle)
 			return GUIMouseButton::Middle;
-		else if(cursorButton == PositionalInputEventButton::Right)
+		else if(pointerButton == PointerEventButton::Right)
 			return GUIMouseButton::Right;
 
 		CM_EXCEPT(InvalidParametersException, "Provided button is not a GUI supported mouse button.");

CamelotCore/Include/CmImporter.h

@@ -80,7 +80,7 @@ namespace BansheeEngine
 		 * @param [in]	importer	The importer that is able to handle files with the specified extension. nullptr if you
 		 * 							want to remove an asset importer for the extension.
 		 */
-		void registerAssetImporter(SpecificImporter* importer);
+		void _registerAssetImporter(SpecificImporter* importer);
 	private:
 		Vector<SpecificImporter*>::type mAssetImporters;
 

CamelotCore/Include/CmInput.h

@@ -51,22 +51,22 @@ namespace BansheeEngine
 		/**
 		 * @brief	Triggers when some pointing device (mouse cursor, touch) moves.
 		 */
-		boost::signal<void(const PositionalInputEvent&)> onCursorMoved;
+		boost::signal<void(const PointerEvent&)> onPointerMoved;
 
 		/**
 		 * @brief	Triggers when some pointing device (mouse cursor, touch) button is pressed.
 		 */
-		boost::signal<void(const PositionalInputEvent&)> onCursorPressed;
+		boost::signal<void(const PointerEvent&)> onPointerPressed;
 
 		/**
 		 * @brief	Triggers when some pointing device (mouse cursor, touch) button is released.
 		 */
-		boost::signal<void(const PositionalInputEvent&)> onCursorReleased;
+		boost::signal<void(const PointerEvent&)> onPointerReleased;
 
 		/**
 		 * @brief	Triggers when some pointing device (mouse cursor, touch) button is double clicked.
 		 */
-		boost::signal<void(const PositionalInputEvent&)> onDoubleClick;
+		boost::signal<void(const PointerEvent&)> onPointerDoubleClick;
 
 		// TODO Low priority: Remove this, I can emulate it using virtual input
 		/**
@@ -79,14 +79,14 @@ namespace BansheeEngine
 		 *
 		 * @note	Internal method.
 		 */
-		void registerRawInputHandler(std::shared_ptr<RawInputHandler> inputHandler);
+		void _registerRawInputHandler(std::shared_ptr<RawInputHandler> inputHandler);
 
 		/**
 		 * @brief	Called every frame. Dispatches any callbacks resulting from input by the user.
 		 *
 		 * @note	Internal method.
 		 */
-		void update();
+		void _update();
 
 		/**
 		 * @brief	Returns smoothed mouse/joystick input in the horizontal axis.
@@ -152,22 +152,22 @@ namespace BansheeEngine
 		/**
 		 * @brief	Cursor movement as OS reports it. Used for screen cursor position.
 		 */
-		void cursorMoved(const PositionalInputEvent& event);
+		void cursorMoved(const PointerEvent& event);
 
 		/**
 		 * @brief	Cursor button presses as OS reports it. 
 		 */
-		void cursorPressed(const PositionalInputEvent& event);
+		void cursorPressed(const PointerEvent& event);
 
 		/**
 		 * @brief	Cursor button releases as OS reports it.
 		 */
-		void cursorReleased(const PositionalInputEvent& event);
+		void cursorReleased(const PointerEvent& event);
 		
 		/**
 		 * @brief	Cursor button releases as OS reports it.
 		 */
-		void cursorDoubleClick(const PositionalInputEvent& event);
+		void cursorDoubleClick(const PointerEvent& event);
 
 		/**
 		 * @brief	Input commands as OS reports them.

CamelotCore/Include/CmInputFwd.h

@@ -255,7 +255,7 @@ namespace BansheeEngine
 		/**
 		 * @brief	Query is the pressed button a gamepad button.
 		 */
-		bool isJoystick() const { return (buttonCode & 0x40000000) != 0; }
+		bool isGamepad() const { return (buttonCode & 0x40000000) != 0; }
 
 		/**
 		 * @brief	Check if the event has been marked as used. Internally this means nothing
@@ -273,18 +273,18 @@ namespace BansheeEngine
 	};
 
 	/**
-	 * @brief	Positional input buttons. Generally these correspond to mouse
+	 * @brief	Pointer buttons. Generally these correspond to mouse
 	 * 			buttons, but may be used in some form for touch input as well.
 	 */
-	enum class PositionalInputEventButton
+	enum class PointerEventButton
 	{
 		Left, Middle, Right, Count
 	};
 
 	/**
-	 * @brief	Type of positional input event.
+	 * @brief	Type of pointer event.
 	 */
-	enum class PositionalInputEventType
+	enum class PointerEventType
 	{
 		CursorMoved,
 		ButtonPressed,
@@ -296,12 +296,12 @@ namespace BansheeEngine
 	 * @brief	Event that gets sent out when user interacts with the screen in some way,
 	 * 			usually by moving the mouse cursor or using touch input.
 	 */
-	struct PositionalInputEvent
+	struct PointerEvent
 	{
 	public:
-		PositionalInputEvent()
-			:mIsUsed(false), mouseWheelScrollAmount(0.0f), type(PositionalInputEventType::CursorMoved),
-			shift(false), control(false), alt(false), button(PositionalInputEventButton::Left)
+		PointerEvent()
+			:mIsUsed(false), mouseWheelScrollAmount(0.0f), type(PointerEventType::CursorMoved),
+			shift(false), control(false), alt(false), button(PointerEventButton::Left)
 		{
 			buttonStates[0] = false;
 			buttonStates[1] = false;
@@ -309,16 +309,16 @@ namespace BansheeEngine
 		}
 
 		Vector2I screenPos; /**< Screen position where the input event occurred. */
-		bool buttonStates[PositionalInputEventButton::Count]; /**< States of the positional input buttons (e.g. mouse buttons). */
-		PositionalInputEventButton button; /**< Button that triggered the positional input event. Might be irrelevant 
-										   depending on event type. (e.g. move events don't correspond to a button. */
-		PositionalInputEventType type; /**< Type of the positional input event. */
+		bool buttonStates[PointerEventButton::Count]; /**< States of the pointer buttons (e.g. mouse buttons). */
+		PointerEventButton button; /**< Button that triggered the pointer event. Might be irrelevant 
+										depending on event type. (e.g. move events don't correspond to a button. */
+		PointerEventType type; /**< Type of the pointer event. */
 
 		bool shift; /**< Is Shift button on the keyboard being held down. */
 		bool control; /**< Is Control button on the keyboard being held down. */
 		bool alt; /**< Is Alt button on the keyboard being held down. */
 
-		float mouseWheelScrollAmount; /**< If mouse wheel is being scrolled, what is the amount. */
+		float mouseWheelScrollAmount; /**< If mouse wheel is being scrolled, what is the amount. Only relevant on move events. */
 
 		/**
 		 * @brief	Check if the event has been marked as used. Internally this means nothing

CamelotCore/Include/CmOSInputHandler.h

@@ -19,7 +19,7 @@ namespace BansheeEngine
 		struct ButtonStateChange
 		{
 			Vector2I cursorPos;
-			OSPositionalInputButtonStates btnStates;
+			OSPointerButtonStates btnStates;
 			OSMouseButton button;
 			bool pressed;
 		};
@@ -27,7 +27,7 @@ namespace BansheeEngine
 		struct DoubleClick
 		{
 			Vector2I cursorPos;
-			OSPositionalInputButtonStates btnStates;
+			OSPointerButtonStates btnStates;
 		};
 
 	public:
@@ -36,10 +36,10 @@ namespace BansheeEngine
 
 		boost::signal<void(UINT32)> onCharInput;
 		boost::signal<void(const Vector2I&, float)> onMouseWheelScrolled;
-		boost::signal<void(const PositionalInputEvent&)> onCursorMoved;
-		boost::signal<void(const PositionalInputEvent&)> onCursorPressed;
-		boost::signal<void(const PositionalInputEvent&)> onCursorReleased;
-		boost::signal<void(const PositionalInputEvent&)> onDoubleClick;
+		boost::signal<void(const PointerEvent&)> onCursorMoved;
+		boost::signal<void(const PointerEvent&)> onCursorPressed;
+		boost::signal<void(const PointerEvent&)> onCursorReleased;
+		boost::signal<void(const PointerEvent&)> onDoubleClick;
 		boost::signal<void(InputCommandType)> onInputCommand;
 
 		/**
@@ -61,7 +61,7 @@ namespace BansheeEngine
 		Queue<ButtonStateChange>::type mButtonStates;
 		Queue<DoubleClick>::type mDoubleClicks;
 		Queue<InputCommandType>::type mInputCommands;
-		OSPositionalInputButtonStates mMouseMoveBtnState;
+		OSPointerButtonStates mMouseMoveBtnState;
 
 		boost::signals::connection mCharInputConn;
 		boost::signals::connection mCursorMovedConn;
@@ -79,22 +79,22 @@ namespace BansheeEngine
 		/**
 		 * @brief	Called from the message loop.
 		 */
-		void cursorMoved(const Vector2I& cursorPos, OSPositionalInputButtonStates& btnStates);
+		void cursorMoved(const Vector2I& cursorPos, OSPointerButtonStates& btnStates);
 
 		/**
 		 * @brief	Called from the message loop.
 		 */
-		void cursorPressed(const Vector2I& cursorPos, OSMouseButton button, OSPositionalInputButtonStates& btnStates);
+		void cursorPressed(const Vector2I& cursorPos, OSMouseButton button, OSPointerButtonStates& btnStates);
 
 		/**
 		 * @brief	Called from the message loop.
 		 */
-		void cursorReleased(const Vector2I& cursorPos, OSMouseButton button, OSPositionalInputButtonStates& btnStates);
+		void cursorReleased(const Vector2I& cursorPos, OSMouseButton button, OSPointerButtonStates& btnStates);
 
 		/**
 		 * @brief	Called from the message loop.
 		 */
-		void cursorDoubleClick(const Vector2I& cursorPos, OSPositionalInputButtonStates& btnStates);
+		void cursorDoubleClick(const Vector2I& cursorPos, OSPointerButtonStates& btnStates);
 
 		/**
 		 * @brief	Called from the message loop.

CamelotCore/Include/CmPlatform.h

@@ -35,9 +35,9 @@ namespace BansheeEngine
 		Left, Middle, Right, Count
 	};
 
-	struct CM_EXPORT OSPositionalInputButtonStates
+	struct CM_EXPORT OSPointerButtonStates
 	{
-		OSPositionalInputButtonStates()
+		OSPointerButtonStates()
 		{
 			mouseButtons[0] = false;
 			mouseButtons[1] = false;

CamelotCore/Include/CmPlatformWndProc.h

@@ -20,7 +20,7 @@ namespace BansheeEngine
 
 		static LRESULT translateNonClientAreaType(NonClientAreaBorderType type);
 
-		static void getMouseData(HWND hWnd, WPARAM wParam, LPARAM lParam, Vector2I& mousePos, OSPositionalInputButtonStates& btnStates);
+		static void getMouseData(HWND hWnd, WPARAM wParam, LPARAM lParam, Vector2I& mousePos, OSPointerButtonStates& btnStates);
 		static bool getCommand(unsigned int virtualKeyCode, InputCommandType& command);
 	};
 }

CamelotCore/Include/CmPrerequisites.h

@@ -95,7 +95,7 @@ namespace BansheeEngine
     class VertexData;
     class VertexDeclaration;
 	class Input;
-	struct PositionalInputEvent;
+	struct PointerEvent;
 	class RawInputHandler;
 	class Renderer;
 	class RendererFactory;

CamelotCore/Include/Win32/CmPlatformImpl.h

@@ -241,10 +241,10 @@ namespace BansheeEngine
 
 		// Callbacks triggered on the core thread. Be careful so that none
 		// of the connected methods call methods intended for sim thread.
-		static boost::signal<void(const Vector2I&, OSPositionalInputButtonStates)> onCursorMoved;
-		static boost::signal<void(const Vector2I&, OSMouseButton button, OSPositionalInputButtonStates)> onCursorButtonPressed;
-		static boost::signal<void(const Vector2I&, OSMouseButton button, OSPositionalInputButtonStates)> onCursorButtonReleased;
-		static boost::signal<void(const Vector2I&, OSPositionalInputButtonStates)> onCursorDoubleClick;
+		static boost::signal<void(const Vector2I&, OSPointerButtonStates)> onCursorMoved;
+		static boost::signal<void(const Vector2I&, OSMouseButton button, OSPointerButtonStates)> onCursorButtonPressed;
+		static boost::signal<void(const Vector2I&, OSMouseButton button, OSPointerButtonStates)> onCursorButtonReleased;
+		static boost::signal<void(const Vector2I&, OSPointerButtonStates)> onCursorDoubleClick;
 		static boost::signal<void(InputCommandType)> onInputCommand;
 		static boost::signal<void(float)> onMouseWheelScrolled;
 		static boost::signal<void(UINT32)> onCharInput;

CamelotCore/Source/CmApplication.cpp

@@ -108,7 +108,7 @@ namespace BansheeEngine
 			Platform::update();
 			DeferredCallManager::instance().update();
 			RenderWindowManager::instance().update();
-			gInput().update();
+			gInput()._update();
 
 			PROFILE_CALL(gSceneManager().update(), "SceneManager");
 

CamelotCore/Source/CmImporter.cpp

@@ -16,8 +16,8 @@ namespace BansheeEngine
 {
 	Importer::Importer()
 	{
-		registerAssetImporter(cm_new<GpuProgIncludeImporter>());
-		registerAssetImporter(cm_new<GpuProgramImporter>());
+		_registerAssetImporter(cm_new<GpuProgIncludeImporter>());
+		_registerAssetImporter(cm_new<GpuProgramImporter>());
 	}
 
 	Importer::~Importer()
@@ -124,7 +124,7 @@ namespace BansheeEngine
 		return importer->createImportOptions();
 	}
 
-	void Importer::registerAssetImporter(SpecificImporter* importer)
+	void Importer::_registerAssetImporter(SpecificImporter* importer)
 	{
 		if(!importer)
 		{

CamelotCore/Source/CmInput.cpp

@@ -48,7 +48,7 @@ namespace BansheeEngine
 		cm_deleteN(mTimesHistoryBuffer, HISTORY_BUFFER_SIZE);
 	}
 
-	void Input::registerRawInputHandler(std::shared_ptr<RawInputHandler> inputHandler)
+	void Input::_registerRawInputHandler(std::shared_ptr<RawInputHandler> inputHandler)
 	{
 		if(mRawInputHandler != inputHandler)
 		{
@@ -64,7 +64,7 @@ namespace BansheeEngine
 		}
 	}
 
-	void Input::update()
+	void Input::_update()
 	{
 		// Toggle states only remain active for a single frame before they are transitioned
 		// into permanent state
@@ -140,34 +140,34 @@ namespace BansheeEngine
 		mAxes[(int)axis] = state;
 	}
 
-	void Input::cursorMoved(const PositionalInputEvent& event)
+	void Input::cursorMoved(const PointerEvent& event)
 	{
 		mMouseAbsPos = event.screenPos;
 
-		if(!onCursorMoved.empty())
-			onCursorMoved(event);
+		if(!onPointerMoved.empty())
+			onPointerMoved(event);
 	}
 
-	void Input::cursorPressed(const PositionalInputEvent& event)
+	void Input::cursorPressed(const PointerEvent& event)
 	{
 		mMouseAbsPos = event.screenPos;
 
-		if(!onCursorPressed.empty())
-			onCursorPressed(event);
+		if(!onPointerPressed.empty())
+			onPointerPressed(event);
 	}
 
-	void Input::cursorReleased(const PositionalInputEvent& event)
+	void Input::cursorReleased(const PointerEvent& event)
 	{
 		mMouseAbsPos = event.screenPos;
 
-		if(!onCursorReleased.empty())
-			onCursorReleased(event);
+		if(!onPointerReleased.empty())
+			onPointerReleased(event);
 	}
 
-	void Input::cursorDoubleClick(const PositionalInputEvent& event)
+	void Input::cursorDoubleClick(const PointerEvent& event)
 	{
-		if(!onDoubleClick.empty())
-			onDoubleClick(event);
+		if(!onPointerDoubleClick.empty())
+			onPointerDoubleClick(event);
 	}
 
 	void Input::inputCommandEntered(InputCommandType commandType)

CamelotCore/Source/CmOSInputHandler.cpp

@@ -36,7 +36,7 @@ namespace BansheeEngine
 		WString inputString;
 		Vector2I mousePosition;
 		float mouseScroll;
-		OSPositionalInputButtonStates mouseMoveBtnState;
+		OSPointerButtonStates mouseMoveBtnState;
 		Queue<ButtonStateChange>::type buttonStates;
 		Queue<DoubleClick>::type doubleClicks;
 		Queue<InputCommandType>::type inputCommands;
@@ -66,7 +66,7 @@ namespace BansheeEngine
 		{
 			if(!onCursorMoved.empty())
 			{
-				PositionalInputEvent event;
+				PointerEvent event;
 				event.alt = false;
 				event.shift = mouseMoveBtnState.shift;
 				event.control = mouseMoveBtnState.ctrl;
@@ -75,7 +75,7 @@ namespace BansheeEngine
 				event.buttonStates[2] = mouseMoveBtnState.mouseButtons[2];
 				event.mouseWheelScrollAmount = mouseScroll;
 
-				event.type = PositionalInputEventType::CursorMoved;
+				event.type = PointerEventType::CursorMoved;
 				event.screenPos = mousePosition;
 
 				onCursorMoved(event);
@@ -88,7 +88,7 @@ namespace BansheeEngine
 		{
 			ButtonStateChange& btnState = buttonStates.front();
 
-			PositionalInputEvent event;
+			PointerEvent event;
 			event.alt = false;
 			event.shift = btnState.btnStates.shift;
 			event.control = btnState.btnStates.ctrl;
@@ -99,13 +99,13 @@ namespace BansheeEngine
 			switch(btnState.button)
 			{
 			case OSMouseButton::Left:
-				event.button = PositionalInputEventButton::Left;
+				event.button = PointerEventButton::Left;
 				break;
 			case OSMouseButton::Middle:
-				event.button = PositionalInputEventButton::Middle;
+				event.button = PointerEventButton::Middle;
 				break;
 			case OSMouseButton::Right:
-				event.button = PositionalInputEventButton::Right;
+				event.button = PointerEventButton::Right;
 				break;
 			}
 			
@@ -113,14 +113,14 @@ namespace BansheeEngine
 
 			if(btnState.pressed)
 			{
-				event.type = PositionalInputEventType::ButtonPressed;
+				event.type = PointerEventType::ButtonPressed;
 
 				if(!onCursorPressed.empty())
 					onCursorPressed(event);
 			}
 			else
 			{
-				event.type = PositionalInputEventType::ButtonReleased;
+				event.type = PointerEventType::ButtonReleased;
 
 				if(!onCursorReleased.empty())
 					onCursorReleased(event);
@@ -135,16 +135,16 @@ namespace BansheeEngine
 			{
 				DoubleClick& btnState = doubleClicks.front();
 
-				PositionalInputEvent event;
+				PointerEvent event;
 				event.alt = false;
 				event.shift = btnState.btnStates.shift;
 				event.control = btnState.btnStates.ctrl;
 				event.buttonStates[0] = btnState.btnStates.mouseButtons[0];
 				event.buttonStates[1] = btnState.btnStates.mouseButtons[1];
 				event.buttonStates[2] = btnState.btnStates.mouseButtons[2];
-				event.button = PositionalInputEventButton::Left;
+				event.button = PointerEventButton::Left;
 				event.screenPos = btnState.cursorPos;
-				event.type = PositionalInputEventType::DoubleClick;
+				event.type = PointerEventType::DoubleClick;
 
 				onDoubleClick(event);
 			}
@@ -176,7 +176,7 @@ namespace BansheeEngine
 		mInputString += character;
 	}
 
-	void OSInputHandler::cursorMoved(const Vector2I& cursorPos, OSPositionalInputButtonStates& btnStates)
+	void OSInputHandler::cursorMoved(const Vector2I& cursorPos, OSPointerButtonStates& btnStates)
 	{
 		CM_LOCK_MUTEX(mOSInputMutex);
 
@@ -185,7 +185,7 @@ namespace BansheeEngine
 	}
 
 	void OSInputHandler::cursorPressed(const Vector2I& cursorPos, 
-		OSMouseButton button, OSPositionalInputButtonStates& btnStates)
+		OSMouseButton button, OSPointerButtonStates& btnStates)
 	{
 		CM_LOCK_MUTEX(mOSInputMutex);
 
@@ -199,7 +199,7 @@ namespace BansheeEngine
 	}
 
 	void OSInputHandler::cursorReleased(const Vector2I& cursorPos, 
-		OSMouseButton button, OSPositionalInputButtonStates& btnStates)
+		OSMouseButton button, OSPointerButtonStates& btnStates)
 	{
 		CM_LOCK_MUTEX(mOSInputMutex);
 
@@ -212,7 +212,7 @@ namespace BansheeEngine
 		btnState.btnStates = btnStates;
 	}
 
-	void OSInputHandler::cursorDoubleClick(const Vector2I& cursorPos, OSPositionalInputButtonStates& btnStates)
+	void OSInputHandler::cursorDoubleClick(const Vector2I& cursorPos, OSPointerButtonStates& btnStates)
 	{
 		CM_LOCK_MUTEX(mOSInputMutex);
 

CamelotCore/Source/CmPlatformWndProc.cpp

@@ -239,7 +239,7 @@ namespace BansheeEngine
 				ReleaseCapture();
 
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -252,7 +252,7 @@ namespace BansheeEngine
 				ReleaseCapture();
 
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -265,7 +265,7 @@ namespace BansheeEngine
 				ReleaseCapture();
 
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -278,7 +278,7 @@ namespace BansheeEngine
 				SetCapture(hWnd);
 
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -291,7 +291,7 @@ namespace BansheeEngine
 				SetCapture(hWnd);
 
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -304,7 +304,7 @@ namespace BansheeEngine
 				SetCapture(hWnd);
 
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -315,7 +315,7 @@ namespace BansheeEngine
 		case WM_LBUTTONDBLCLK:
 			{
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -342,7 +342,7 @@ namespace BansheeEngine
 					return true;
 
 				Vector2I intMousePos;
-				OSPositionalInputButtonStates btnStates;
+				OSPointerButtonStates btnStates;
 				
 				getMouseData(hWnd, wParam, lParam, intMousePos, btnStates);
 
@@ -491,7 +491,7 @@ namespace BansheeEngine
 		return dir;
 	}
 
-	void PlatformWndProc::getMouseData(HWND hWnd, WPARAM wParam, LPARAM lParam, Vector2I& mousePos, OSPositionalInputButtonStates& btnStates)
+	void PlatformWndProc::getMouseData(HWND hWnd, WPARAM wParam, LPARAM lParam, Vector2I& mousePos, OSPointerButtonStates& btnStates)
 	{
 		POINT clientPoint;
 

CamelotCore/Source/Win32/CmPlatformImpl.cpp

@@ -10,10 +10,10 @@ namespace BansheeEngine
 {
 	boost::signal<void(RenderWindow*)> Platform::onMouseLeftWindow;
 
-	boost::signal<void(const Vector2I&, OSPositionalInputButtonStates)> Platform::onCursorMoved;
-	boost::signal<void(const Vector2I&, OSMouseButton button, OSPositionalInputButtonStates)> Platform::onCursorButtonPressed;
-	boost::signal<void(const Vector2I&, OSMouseButton button, OSPositionalInputButtonStates)> Platform::onCursorButtonReleased;
-	boost::signal<void(const Vector2I&, OSPositionalInputButtonStates)> Platform::onCursorDoubleClick;
+	boost::signal<void(const Vector2I&, OSPointerButtonStates)> Platform::onCursorMoved;
+	boost::signal<void(const Vector2I&, OSMouseButton button, OSPointerButtonStates)> Platform::onCursorButtonPressed;
+	boost::signal<void(const Vector2I&, OSMouseButton button, OSPointerButtonStates)> Platform::onCursorButtonReleased;
+	boost::signal<void(const Vector2I&, OSPointerButtonStates)> Platform::onCursorDoubleClick;
 	boost::signal<void(InputCommandType)> Platform::onInputCommand;
 	boost::signal<void(float)> Platform::onMouseWheelScrolled;
 	boost::signal<void(UINT32)> Platform::onCharInput;

CamelotFBXImporter/Include/CmFBXImporter.h

@@ -25,7 +25,7 @@ namespace BansheeEngine
 			if(importer == nullptr)
 			{
 				importer = cm_new<FBXImporter>();
-				Importer::instance().registerAssetImporter(importer);
+				Importer::instance()._registerAssetImporter(importer);
 			}
 		}
 

CamelotFontImporter/Include/CmFontImporter.h

@@ -21,7 +21,7 @@ namespace BansheeEngine
 			if(importer == nullptr)
 			{
 				importer = cm_new<FontImporter>();
-				Importer::instance().registerAssetImporter(importer);
+				Importer::instance()._registerAssetImporter(importer);
 			}
 		}
 

CamelotFreeImgImporter/Include/CmFreeImgImporter.h

@@ -23,7 +23,7 @@ namespace BansheeEngine
 			if(importer == nullptr)
 			{
 				importer = cm_new<FreeImgImporter>();
-				Importer::instance().registerAssetImporter(importer);
+				Importer::instance()._registerAssetImporter(importer);
 			}
 		}
 

CamelotOISInput/Source/CmOISPlugin.cpp

@@ -18,7 +18,7 @@ namespace BansheeEngine
 
 		std::shared_ptr<RawInputHandler> inputHandler = cm_shared_ptr<InputHandlerOIS>(windowId);
 
-		gInput().registerRawInputHandler(inputHandler);
+		gInput()._registerRawInputHandler(inputHandler);
 
 		return nullptr;
 	}