Fixed OpenGL texture binding

Alpha picking works
Fix for gizmo icon rendering on DX9 and DX11
Fixed ResourceHandle casing so it doesn't implicitly cast between invalid types
Properly hooked up SBansheeEditor shutdown

BansheeCore/Include/BsCoreApplication.h

@@ -72,6 +72,14 @@ namespace BansheeEngine
 			 */
 			void unloadPlugin(DynLib* library);
 
+			/**
+			 * @brief	Calls the shutdown method on the plugin.
+			 *
+			 * @note	This is separate from "unload" method and should be called
+			 *			before unload.
+			 */
+			void shutdownPlugin(DynLib* library);
+
 	protected:
 		/**
 		 * @brief	Called for each iteration of the main loop.

BansheeCore/Include/BsResourceHandle.h

@@ -126,8 +126,7 @@ namespace BansheeEngine
 		/**
 		 * @brief	Copy constructor.
 		 */
-		template <typename T1>
-		ResourceHandle(const ResourceHandle<T1>& ptr)
+		ResourceHandle(const ResourceHandle<T>& ptr)
 			:ResourceHandleBase()
 		{
 			mData = ptr.getHandleData();
@@ -136,9 +135,12 @@ namespace BansheeEngine
 		/**
 		 * @brief	Converts a specific handle to generic Resource handle.
 		 */
-		operator ResourceHandle<Resource>() 
+		operator ResourceHandle<Resource>() const
 		{
-			return ResourceHandle<Resource>(*this); 
+			ResourceHandle<Resource> handle;
+			handle._setHandleData(getHandleData());
+
+			return handle;
 		}
 
 		/**
@@ -239,7 +241,10 @@ namespace BansheeEngine
 	template<class _Ty1, class _Ty2>
 		ResourceHandle<_Ty1> static_resource_cast(const ResourceHandle<_Ty2>& other)
 	{	
-		return ResourceHandle<_Ty1>(other);
+		ResourceHandle<_Ty1> handle;
+		handle._setHandleData(other.getHandleData());
+
+		return handle;
 	}
 
 	/**

BansheeCore/Source/BsCoreApplication.cpp

@@ -122,9 +122,11 @@ namespace BansheeEngine
 		MeshManager::shutDown();
 		ProfilerGPU::shutDown();
 
+		shutdownPlugin(mSceneManagerPlugin);
 		unloadPlugin(mSceneManagerPlugin);
 		
 		RendererManager::shutDown();
+		shutdownPlugin(mRendererPlugin);
 		unloadPlugin(mRendererPlugin);
 
 		Input::shutDown();
@@ -311,11 +313,21 @@ namespace BansheeEngine
 		if(unloadPluginFunc != nullptr)
 			unloadPluginFunc();
 
-		mPluginUpdateFunctions.erase(library);
-
 		gDynLibManager().unload(library);
 	}
 
+	void CoreApplication::shutdownPlugin(DynLib* library)
+	{
+		typedef void(*ShutdownPluginFunc)();
+
+		ShutdownPluginFunc shutdownPluginFunc = (ShutdownPluginFunc)library->getSymbol("shutdownPlugin");
+
+		if (shutdownPluginFunc != nullptr)
+			shutdownPluginFunc();
+
+		mPluginUpdateFunctions.erase(library);
+	}
+
 	CoreApplication& gCoreApplication()
 	{
 		return CoreApplication::instance();

BansheeCore/Source/BsFont.cpp

@@ -87,7 +87,7 @@ namespace BansheeEngine
 	{
 		FontPtr newFont = _createPtr(fontData);
 
-		return gResources()._createResourceHandle(newFont);
+		return static_resource_cast<Font>(gResources()._createResourceHandle(newFont));
 	}
 
 	FontPtr Font::_createPtr(const Vector<FontData>& fontData)

BansheeCore/Source/BsRenderTexture.cpp

@@ -140,10 +140,10 @@ namespace BansheeEngine
 		// Create non-persistent resource handles for the used textures (we only need them because a lot of the code accepts only handles,
 		// since they're non persistent they don't really have any benefit over shared pointers)
 		if (desc.colorSurface.texture != nullptr)
-			mBindableColorTex = gResources()._createResourceHandle(desc.colorSurface.texture);
+			mBindableColorTex = static_resource_cast<Texture>(gResources()._createResourceHandle(desc.colorSurface.texture));
 
 		if (desc.depthStencilSurface.texture != nullptr)
-			mBindableDepthStencilTex = gResources()._createResourceHandle(desc.depthStencilSurface.texture);
+			mBindableDepthStencilTex = static_resource_cast<Texture>(gResources()._createResourceHandle(desc.depthStencilSurface.texture));
 
 		RenderTarget::initialize();
 	}

BansheeD3D11RenderSystem/Source/BsD3D11RenderSystem.cpp

@@ -1025,7 +1025,7 @@ namespace BansheeEngine
 
 	float D3D11RenderSystem::getMaximumDepthInputValue()
 	{
-		return -1.0f;
+		return 1.0f;
 	}
 
 	/************************************************************************/

BansheeD3D9RenderSystem/Source/BsD3D9RenderSystem.cpp

@@ -1503,8 +1503,7 @@ namespace BansheeEngine
 	float D3D9RenderSystem::getMaximumDepthInputValue()
 	{
 		// Range [0.0f, 1.0f]
-		// D3D inverts even identity view matrices, so maximum INPUT is -1.0
-		return -1.0f;
+		return 1.0f;
 	}
 
 	VertexElementType D3D9RenderSystem::getColorVertexElementType() const

BansheeEditor/Include/BsEditorApplication.h

@@ -22,6 +22,7 @@ namespace BansheeEngine
 
 	private:
 		virtual void onStartUp();
+		virtual void onShutDown();
 		virtual void update();
 
 		EditorWidgetLayoutPtr loadWidgetLayout();
@@ -33,6 +34,8 @@ namespace BansheeEngine
 		static const Path WIDGET_LAYOUT_PATH;
 		RenderSystemPlugin mActiveRSPlugin;
 
+		DynLib* mSBansheeEditorPlugin;
+
 		// DEBUG ONLY
 
 		HGpuProgram mFragProgRef;

BansheeEditor/Include/BsHandleDrawManager.h

@@ -53,7 +53,6 @@ namespace BansheeEngine
 		{
 			MaterialProxyPtr proxy;
 			GpuParamMat4 mViewProj;
-			GpuParamMat4 mViewIT;
 		};
 
 		struct WireMaterialData

BansheeEditor/Include/BsSceneEditorWidget.h

@@ -54,6 +54,7 @@ namespace BansheeEngine
 		HCamera mCamera;
 		GameObjectHandle<SceneCameraController> mCameraController;
 		SceneGrid* mSceneGrid;
+		bool mLeftButtonPressed;
 
 		HEvent mRenderCallback;
 		HEvent mOnPointerMovedConn;

BansheeEditor/Source/BsBuiltinEditorResources.cpp

@@ -557,7 +557,7 @@ namespace BansheeEngine
 		mSkin.setStyle("ListBox", dropDownListStyle);
 
 		// DropDown scroll up button arrow
-		HTexture dropDownBtnScrollUpArrow = getGUITexture(DropDownBoxBtnUpArrowTex);
+		HSpriteTexture dropDownBtnScrollUpArrow = getGUITexture(DropDownBoxBtnUpArrowTex);
 
 		GUIElementStyle dropDownScrollUpBtnArrowStyle;
 		dropDownScrollUpBtnArrowStyle.normal.texture = getGUITexture(DropDownBoxBtnUpArrowTex);
@@ -1150,7 +1150,7 @@ namespace BansheeEngine
 					importOptions->setAntialiasing(false);
 				}
 
-				HFont font = Importer::instance().import(fontPath, fontImportOptions);
+				HFont font = Importer::instance().import<Font>(fontPath, fontImportOptions);
 
 				Path outputPath = FileSystem::getWorkingDirectoryPath();
 				outputPath.append(DefaultSkinFolder);
@@ -1204,7 +1204,7 @@ namespace BansheeEngine
 					importOptions->setType(importData.type);
 				}
 
-				HGpuProgram gpuProgram = Importer::instance().import(gpuProgInputLoc, gpuProgImportOptions);
+				HGpuProgram gpuProgram = Importer::instance().import<GpuProgram>(gpuProgInputLoc, gpuProgImportOptions);
 				Resources::instance().save(gpuProgram, gpuProgOutputLoc, true);
 			}
 		}
@@ -1354,6 +1354,7 @@ namespace BansheeEngine
 
 		mShaderPickingAlpha[modeIdx]->addParameter("mainTexture", "mainTexture", GPOT_TEXTURE2D);
 
+		mShaderPickingAlpha[modeIdx]->addParameter("alphaCutoff", "alphaCutoff", GPDT_FLOAT1);
 		mShaderPickingAlpha[modeIdx]->addParameter("colorIndex", "colorIndex", GPDT_FLOAT4);
 		mShaderPickingAlpha[modeIdx]->addParameter("matWorldViewProj", "matWorldViewProj", GPDT_MATRIX_4X4);
 

BansheeEditor/Source/BsEditorApplication.cpp

@@ -58,7 +58,7 @@ namespace BansheeEngine
 
 	EditorApplication::EditorApplication(RenderSystemPlugin renderSystemPlugin)
 		:Application(createRenderWindowDesc(), renderSystemPlugin, RendererPlugin::Default), 
-		mActiveRSPlugin(renderSystemPlugin)
+		mActiveRSPlugin(renderSystemPlugin), mSBansheeEditorPlugin(nullptr)
 	{
 		BuiltinEditorResources::startUp(renderSystemPlugin);
 
@@ -100,6 +100,10 @@ namespace BansheeEngine
 		EditorWindowManager::shutDown();
 		UndoRedo::shutDown();
 
+		// We purposely don't unload this plugin, it needs to be unloaded after
+		// all mono assemblies have been unloaded (since their finalizers will call
+		// into the plugin). So we leave it to be unloaded automatically on app exit
+		shutdownPlugin(mSBansheeEditorPlugin);
 
 		/************************************************************************/
 		/* 								DEBUG CODE                      		*/
@@ -141,7 +145,7 @@ namespace BansheeEngine
 		Application::onStartUp();
 
 		MainEditorWindow* mainWindow = MainEditorWindow::create(getPrimaryWindow());
-		loadPlugin("SBansheeEditor"); // Managed part of the editor
+		loadPlugin("SBansheeEditor", &mSBansheeEditorPlugin); // Managed part of the editor
 
 		EditorWidgetLayoutPtr layout = loadWidgetLayout();
 		if (layout != nullptr)
@@ -217,7 +221,7 @@ namespace BansheeEngine
 			importOptions->setType(GPT_FRAGMENT_PROGRAM);
 		}
 
-		mFragProgRef = Importer::instance().import(psLoc, gpuProgImportOptions);
+		mFragProgRef = Importer::instance().import<GpuProgram>(psLoc, gpuProgImportOptions);
 
 		gpuProgImportOptions = Importer::instance().createImportOptions(vsLoc);
 		if (rtti_is_of_type<GpuProgramImportOptions>(gpuProgImportOptions))
@@ -230,15 +234,15 @@ namespace BansheeEngine
 			importOptions->setType(GPT_VERTEX_PROGRAM);
 		}
 
-		mVertProgRef = Importer::instance().import(vsLoc, gpuProgImportOptions);
+		mVertProgRef = Importer::instance().import<GpuProgram>(vsLoc, gpuProgImportOptions);
 
 		gResources().save(mVertProgRef, L"C:\\vertProgCg.vprog", true);
 		gResources().unload(mVertProgRef);
-		mVertProgRef = gResources().load(L"C:\\vertProgCg.vprog");
+		mVertProgRef = gResources().load<GpuProgram>(L"C:\\vertProgCg.vprog");
 
 		gResources().save(mFragProgRef, L"C:\\fragProgCg.vprog", true);
 		gResources().unload(mFragProgRef);
-		mFragProgRef = gResources().load(L"C:\\fragProgCg.vprog");
+		mFragProgRef = gResources().load<GpuProgram>(L"C:\\fragProgCg.vprog");
 
 		mTestShader = Shader::create("TestShader");
 		mTestShader->addParameter("matWorldViewProj", "matWorldViewProj", GPDT_MATRIX_4X4, RPS_WorldViewProjTfrm);
@@ -289,7 +293,7 @@ namespace BansheeEngine
 
 		gResources().unload(mTestMaterial);
 
-		mTestMaterial = gResources().load(L"C:\\ExportMaterial.mat");
+		mTestMaterial = gResources().load<Material>(L"C:\\ExportMaterial.mat");
 
 		testRenderable->setMesh(mDbgMeshRef);
 		testRenderable->setMaterial(0, mTestMaterial);
@@ -358,6 +362,11 @@ namespace BansheeEngine
 		DbgEditorWidget2::open(); // DEBUG ONLY
 	}
 
+	void EditorApplication::onShutDown()
+	{
+		Application::onShutDown();
+	}
+
 	void EditorApplication::startUp(RenderSystemPlugin renderSystemPlugin)
 	{
 		CoreApplication::startUp<EditorApplication>(renderSystemPlugin);

BansheeEditor/Source/BsGizmoManager.cpp

@@ -425,8 +425,8 @@ namespace BansheeEngine
 		{
 			if (a.distance == b.distance)
 			{
-				HSpriteTexture texA = iconData[a.iconIdx].texture->getTexture();
-				HSpriteTexture texB = iconData[b.iconIdx].texture->getTexture();
+				HTexture texA = iconData[a.iconIdx].texture->getTexture();
+				HTexture texB = iconData[b.iconIdx].texture->getTexture();
 
 				if (texA == texB)
 					return a.iconIdx < b.iconIdx;
@@ -708,7 +708,6 @@ namespace BansheeEngine
 		THROW_IF_NOT_CORE_THREAD;
 
 		Matrix4 viewProjMat = projMatrix * viewMatrix;
-		Matrix4 viewIT = viewMatrix.inverse().transpose();
 
 		mWireMaterial.mViewProj.set(viewProjMat);
 

BansheeEditor/Source/BsHandleDrawManager.cpp

@@ -34,14 +34,14 @@ namespace BansheeEngine
 
 	HandleDrawManager::~HandleDrawManager()
 	{
-		bs_delete(mDrawHelper);
-
 		if (mSolidMesh != nullptr)
 			mDrawHelper->releaseSolidMesh(mSolidMesh);
 
 		if (mWireMesh != nullptr)
 			mDrawHelper->releaseWireMesh(mWireMesh);
 
+		bs_delete(mDrawHelper);
+
 		gCoreAccessor().queueCommand(std::bind(&HandleDrawManager::destroyCore, this, mCore));
 	}
 
@@ -150,18 +150,17 @@ namespace BansheeEngine
 	{
 		// TODO - Make a better interface when dealing with parameters through proxies?
 		{
-			MaterialProxyPtr proxy = mWireMaterial.proxy;
-			GpuParamsPtr vertParams = proxy->params[proxy->passes[0].vertexProgParamsIdx];
+			mWireMaterial.proxy = wireMatProxy;
+			GpuParamsPtr vertParams = wireMatProxy->params[wireMatProxy->passes[0].vertexProgParamsIdx];
 
 			vertParams->getParam("matViewProj", mWireMaterial.mViewProj);
 		}
 
 		{
-			MaterialProxyPtr proxy = mSolidMaterial.proxy;
-			GpuParamsPtr vertParams = proxy->params[proxy->passes[0].vertexProgParamsIdx];
+			mSolidMaterial.proxy = solidMatProxy;
+			GpuParamsPtr vertParams = solidMatProxy->params[solidMatProxy->passes[0].vertexProgParamsIdx];
 
 			vertParams->getParam("matViewProj", mSolidMaterial.mViewProj);
-			vertParams->getParam("matViewIT", mSolidMaterial.mViewIT);
 		}
 
 		RendererPtr activeRenderer = RendererManager::instance().getActive();
@@ -200,10 +199,8 @@ namespace BansheeEngine
 		THROW_IF_NOT_CORE_THREAD;
 
 		Matrix4 viewProjMat = projMatrix * viewMatrix;
-		Matrix4 viewIT = viewMatrix.inverse().transpose();
 
 		mSolidMaterial.mViewProj.set(viewProjMat);
-		mSolidMaterial.mViewIT.set(viewIT);
 
 		Renderer::setPass(*mSolidMaterial.proxy, 0);
 		Renderer::draw(*meshProxy);
@@ -214,7 +211,6 @@ namespace BansheeEngine
 		THROW_IF_NOT_CORE_THREAD;
 
 		Matrix4 viewProjMat = projMatrix * viewMatrix;
-		Matrix4 viewIT = viewMatrix.inverse().transpose();
 
 		mWireMaterial.mViewProj.set(viewProjMat);
 

BansheeEditor/Source/BsSceneEditorWidget.cpp

@@ -21,6 +21,8 @@
 #include "BsInput.h"
 #include "BsGUILayoutUtility.h"
 #include "BsScenePicking.h"
+#include "BsHandleManager.h"
+#include "BsSelection.h"
 
 // DEBUG ONLY
 #include "BsTime.h"
@@ -37,7 +39,7 @@ namespace BansheeEngine
 	SceneEditorWidget* SceneEditorWidget::Instance = nullptr;
 
 	SceneEditorWidget::SceneEditorWidget(const ConstructPrivately& dummy, EditorWidgetContainer& parentContainer)
-		:EditorWidget<SceneEditorWidget>(HString(L"SceneEditorWidget"), parentContainer), mGUIRenderTexture(nullptr)
+		:EditorWidget<SceneEditorWidget>(HString(L"SceneEditorWidget"), parentContainer), mGUIRenderTexture(nullptr), mLeftButtonPressed(false)
 	{
 		SceneViewLocator::_provide(this);
 
@@ -106,29 +108,76 @@ namespace BansheeEngine
 
 	void SceneEditorWidget::onPointerMoved(const PointerEvent& event)
 	{
+		Vector2I scenePos;
+		if (!toSceneViewPos(event.screenPos, scenePos))
+			return;
+
+		if (mLeftButtonPressed)
+		{
+			Ray inputRay = mCamera->screenPointToRay(scenePos);
 
-		
+			HandleManager::instance().update(scenePos, inputRay, mLeftButtonPressed);
+		}
 	}
 
 	void SceneEditorWidget::onPointerReleased(const PointerEvent& event)
 	{
+		if (event.button != PointerEventButton::Left)
+			return;
 
+		Vector2I scenePos;
+		if (!toSceneViewPos(event.screenPos, scenePos))
+			return;
+
+		mLeftButtonPressed = false;
+		Ray inputRay = mCamera->screenPointToRay(scenePos);
+
+		HandleManager::instance().update(scenePos, inputRay, mLeftButtonPressed);
 	}
 
 	void SceneEditorWidget::onPointerPressed(const PointerEvent& event)
 	{
+		if (event.button != PointerEventButton::Left)
+			return;
+
 		Vector2I scenePos;
 		if (!toSceneViewPos(event.screenPos, scenePos))
 			return;
 
-		HSceneObject pickedObject = ScenePicking::instance().pickClosestSceneObject(mCamera, scenePos, Vector2I(1, 1));
-		if (pickedObject)
-		{
-			LOGDBG("PICKED OBJECT: " + pickedObject->getName());
-		}
-		else
+		mLeftButtonPressed = true;
+		Ray inputRay = mCamera->screenPointToRay(scenePos);
+
+		HandleManager::instance().update(scenePos, inputRay, mLeftButtonPressed);
+
+		// If we didn't hit a handle, perform normal selection
+		if (!HandleManager::instance().isHandleActive())
 		{
-			LOGDBG("PICKED NO OBJECT!");
+			// TODO - Handle multi-selection (i.e. selection rectangle when dragging)
+			// TODO - Handle selecting gizmos (will likely require slight refactor of ScenePicking)
+			HSceneObject pickedObject = ScenePicking::instance().pickClosestSceneObject(mCamera, scenePos, Vector2I(1, 1));
+
+			if (pickedObject)
+			{
+				if (event.control) // Append to existing selection
+				{
+					Vector<HSceneObject> selectedSOs = Selection::instance().getSceneObjects();
+
+					auto iterFind = std::find_if(selectedSOs.begin(), selectedSOs.end(), 
+						[&](const HSceneObject& obj) { return obj == pickedObject; }
+					);
+
+					if (iterFind != selectedSOs.end())
+						selectedSOs.push_back(pickedObject);
+
+					Selection::instance().setSceneObjects(selectedSOs);
+				}
+				else
+				{
+					Vector<HSceneObject> selectedSOs = { pickedObject };
+
+					Selection::instance().setSceneObjects(selectedSOs);
+				}
+			}
 		}
 	}
 

BansheeEditor/Source/BsSelection.cpp

@@ -33,7 +33,7 @@ namespace BansheeEngine
 
 		GUISceneTreeView* sceneTreeView = SceneTreeViewLocator::instance();
 		if (sceneTreeView != nullptr)
-			sceneTreeView->setSelection(mSelectedSceneObjects);
+			sceneTreeView->setSelection(sceneObjects);
 	}
 
 	const Vector<Path>& Selection::getResourcePaths() const

BansheeEngine/Source/BsApplication.cpp

@@ -50,7 +50,10 @@ namespace BansheeEngine
 	Application::~Application()
 	{
 #if BS_VER == BS_VER_DEV
+		shutdownPlugin(mSBansheeEnginePlugin);
 		unloadPlugin(mSBansheeEnginePlugin);
+
+		shutdownPlugin(mMonoPlugin);
 		unloadPlugin(mMonoPlugin);
 #endif
 

BansheeEngine/Source/BsBuiltinResources.cpp

@@ -680,7 +680,7 @@ namespace BansheeEngine
 					importOptions->setAntialiasing(false);
 				}
 
-				HFont font = Importer::instance().import(fontPath, fontImportOptions);
+				HFont font = Importer::instance().import<Font>(fontPath, fontImportOptions);
 
 				Path outputPath = FileSystem::getWorkingDirectoryPath();
 				outputPath.append(DefaultSkinFolder);
@@ -734,7 +734,7 @@ namespace BansheeEngine
 					importOptions->setType(importData.type);
 				}
 
-				HGpuProgram gpuProgram = Importer::instance().import(gpuProgInputLoc, gpuProgImportOptions);
+				HGpuProgram gpuProgram = Importer::instance().import<GpuProgram>(gpuProgInputLoc, gpuProgImportOptions);
 				Resources::instance().save(gpuProgram, gpuProgOutputLoc, true);
 			}
 		}

BansheeEngine/Source/BsGUITexture.cpp

@@ -64,7 +64,7 @@ namespace BansheeEngine
 	GUITexture* GUITexture::create(GUIImageScaleMode scale, const GUIOptions& layoutOptions, const String& styleName)
 	{
 		return new (bs_alloc<GUITexture, PoolAlloc>()) GUITexture(getStyleName<GUITexture>(styleName), 
-			HTexture(), scale, GUILayoutOptions::create(layoutOptions));
+			HSpriteTexture(), scale, GUILayoutOptions::create(layoutOptions));
 	}
 
 	GUITexture* GUITexture::create(GUIImageScaleMode scale, const String& styleName)
@@ -76,13 +76,13 @@ namespace BansheeEngine
 	GUITexture* GUITexture::create(const GUIOptions& layoutOptions, const String& styleName)
 	{
 		return new (bs_alloc<GUITexture, PoolAlloc>()) GUITexture(getStyleName<GUITexture>(styleName), 
-			HTexture(), GUIImageScaleMode::StretchToFit, GUILayoutOptions::create(layoutOptions));
+			HSpriteTexture(), GUIImageScaleMode::StretchToFit, GUILayoutOptions::create(layoutOptions));
 	}
 
 	GUITexture* GUITexture::create(const String& styleName)
 	{
 		return new (bs_alloc<GUITexture, PoolAlloc>()) GUITexture(getStyleName<GUITexture>(styleName), 
-			HTexture(), GUIImageScaleMode::StretchToFit, GUILayoutOptions::create());
+			HSpriteTexture(), GUIImageScaleMode::StretchToFit, GUILayoutOptions::create());
 	}
 
 	void GUITexture::setTexture(const HSpriteTexture& texture)

BansheeGLRenderSystem/Source/BsGLRenderSystem.cpp

@@ -259,7 +259,6 @@ namespace BansheeEngine
 				setTexture(gptype, iter->second.slot, true, texture.getInternalPtr());
 		}
 
-		UINT32 texUnit = 0;
 		for(auto iter = paramDesc.samplers.begin(); iter != paramDesc.samplers.end(); ++iter)
 		{
 			HSamplerState& samplerState = bindableParams->getSamplerState(iter->second.slot);
@@ -269,9 +268,7 @@ namespace BansheeEngine
 			else
 				setSamplerState(gptype, iter->second.slot, samplerState.getInternalPtr());
 
-			glProgramUniform1i(glProgram, iter->second.slot, getGLTextureUnit(gptype, texUnit));
-
-			texUnit++;
+			glProgramUniform1i(glProgram, iter->second.slot, getGLTextureUnit(gptype, iter->second.slot));
 		}
 
 		UINT8* uniformBufferData = nullptr;
@@ -1718,7 +1715,7 @@ namespace BansheeEngine
 		mNumTextureTypes = numCombinedTexUnits;
 		mTextureTypes = bs_newN<GLenum>(mNumTextureTypes);
 		for(UINT16 i = 0; i < numCombinedTexUnits; i++)
-			mTextureTypes[i] = 0;
+			mTextureTypes[i] = GL_TEXTURE_2D;
 
 		mVertexUBOffset = 0;
 		UINT32 totalNumUniformBlocks = caps->getNumGpuParamBlockBuffers(GPT_VERTEX_PROGRAM);

SBansheeEditor/Include/BsScriptHandleManager.h

@@ -32,8 +32,6 @@ namespace BansheeEngine
 		ScriptHandleManager(RuntimeScriptObjects& scriptObjectManager);
 		~ScriptHandleManager();
 
-		void update();
-
 	protected:
 		void refreshHandles();
 		void triggerHandles();

SBansheeEditor/Source/BsEditorScriptManager.cpp

@@ -6,6 +6,7 @@
 #include "BsMonoMethod.h"
 #include "BsRuntimeScriptObjects.h"
 #include "BsScriptGizmoManager.h"
+#include "BsScriptHandleManager.h"
 #include "BsTime.h"
 #include "BsMath.h"
 
@@ -26,6 +27,7 @@ namespace BansheeEngine
 		RuntimeScriptObjects::instance().refreshScriptObjects(BansheeEditorAssemblyName);
 
 		ScriptGizmoManager::startUp(RuntimeScriptObjects::instance());
+		HandleManager::startUp<ScriptHandleManager>(RuntimeScriptObjects::instance());
 
 		mProgramEdClass = mEditorAssembly->getClass("BansheeEditor", "ProgramEd");
 		mUpdateMethod = mProgramEdClass->getMethod("EditorUpdate");
@@ -39,6 +41,7 @@ namespace BansheeEngine
 
 	EditorScriptManager::~EditorScriptManager()
 	{
+		HandleManager::shutDown();
 		ScriptGizmoManager::shutDown();
 	}
 

SBansheeEditor/Source/BsScriptEditorPlugin.cpp

@@ -21,8 +21,13 @@ namespace BansheeEngine
 		EditorScriptManager::instance().update();
 	}
 
-	extern "C" BS_SCR_BED_EXPORT void unloadPlugin()
+	extern "C" BS_SCR_BED_EXPORT void shutdownPlugin()
 	{
 		EditorScriptManager::shutDown();
 	}
+
+	extern "C" BS_SCR_BED_EXPORT void unloadPlugin()
+	{
+		
+	}
 }

SBansheeEditor/Source/BsScriptHandleManager.cpp

@@ -36,8 +36,11 @@ namespace BansheeEngine
 			mono_gchandle_free(handle.gcHandle);
 		}
 
-		callDestroy(mDefaultHandleManager);
-		mono_gchandle_free(mDefaultHandleManagerGCHandle);
+		if (mDefaultHandleManager != nullptr)
+		{
+			callDestroy(mDefaultHandleManager);
+			mono_gchandle_free(mDefaultHandleManagerGCHandle);
+		}
 
 		mAssemblyRefreshedConn.disconnect();
 	}

SBansheeEngine/Source/BsManagedSerializableField.cpp

@@ -410,9 +410,10 @@ namespace BansheeEngine
 			{
 				if(value)
 				{
-					ScriptTexture2D* scriptResource = ScriptResourceManager::instance().getScriptTexture(value);
+					HTexture texture = static_resource_cast<Texture>(value);
+					ScriptTexture2D* scriptResource = ScriptResourceManager::instance().getScriptTexture(texture);
 					if(scriptResource == nullptr)
-						scriptResource = ScriptResourceManager::instance().createScriptTexture(value);
+						scriptResource = ScriptResourceManager::instance().createScriptTexture(texture);
 
 					return scriptResource->getManagedInstance();
 				}
@@ -423,9 +424,10 @@ namespace BansheeEngine
 			{
 				if(value)
 				{
-					ScriptSpriteTexture* scriptResource = ScriptResourceManager::instance().getScriptSpriteTexture(value);
+					HSpriteTexture spriteTexture = static_resource_cast<SpriteTexture>(value);
+					ScriptSpriteTexture* scriptResource = ScriptResourceManager::instance().getScriptSpriteTexture(spriteTexture);
 					if(scriptResource == nullptr)
-						scriptResource = ScriptResourceManager::instance().createScriptSpriteTexture(value);
+						scriptResource = ScriptResourceManager::instance().createScriptSpriteTexture(spriteTexture);
 
 					if(scriptResource != nullptr)
 						return scriptResource->getManagedInstance();
@@ -437,7 +439,8 @@ namespace BansheeEngine
 			{
 				if (value)
 				{
-					ScriptManagedResource* scriptResource = ScriptResourceManager::instance().getScriptManagedResource(value);
+					HManagedResource managedResource = static_resource_cast<ManagedResource>(value);
+					ScriptManagedResource* scriptResource = ScriptResourceManager::instance().getScriptManagedResource(managedResource);
 					assert(scriptResource != nullptr); // Managed resource managed instance is created upon creation so it may never be null
 
 					return scriptResource->getManagedInstance();

SBansheeEngine/Source/BsScriptGUIElementStyle.cpp

@@ -111,7 +111,7 @@ namespace BansheeEngine
 	void ScriptGUIElementStyle::internal_SetFont(ScriptGUIElementStyle* nativeInstance, MonoObject* value)
 	{
 		ScriptFont* nativeValue = ScriptFont::toNative(value);
-		nativeInstance->mElementStyle->font = nativeValue->getNativeHandle();
+		nativeInstance->mElementStyle->font = static_resource_cast<Font>(nativeValue->getNativeHandle());
 		nativeInstance->mFont = nativeValue;
 	}
 }

SBansheeEngine/Source/BsScriptSpriteTexture.cpp

@@ -30,7 +30,7 @@ namespace BansheeEngine
 		}
 		else
 		{
-			HSpriteTexture spriteTexture = SpriteTexture::create(offset, scale, scriptTexture->getNativeHandle());
+			HSpriteTexture spriteTexture = SpriteTexture::create(offset, scale, static_resource_cast<Texture>(scriptTexture->getNativeHandle()));
 
 			ScriptResourceManager::instance().createScriptSpriteTexture(instance, spriteTexture);
 		}

SceneView.txt

@@ -5,16 +5,11 @@
 	- Then make a Component wrapper around the non-component types, and also a C# wrapper around the same types
 
 RESOURCES CAN BE INCORRECTLY CAST between each other. e.g. HSpriteTexture to HTexture will be cast implicitly.
-Second pass for Gizmo ICon rendering doesn't work - actually it doesn't seem to render at all even if I send normal depth compare function
-
-TESTING:
- - Test picking on an object with alpha
- - Ensure that selecting an item in scene properly marks it in scene view
- - Ensure that selecting an item in scene or resource tree view properly updates Selection
+REFACTOR material getParams* and related classes. Those params should update all gpu program params that share that variable, not just the first found
+Icon appears faded even if it renders in front of a mesh (OpenGL). Likely wrong depth.
+Crash related to Handles when object is selected
 
 Test gizmos
- - Test rendering of icon gizmos
-   - Need a way to load a texture from C# (Extend ProjectLibrary?)
  - HOOK UP GIZMO SELECTION and test it
 
 Test handles
@@ -68,12 +63,6 @@ CONCRETE TODO:
 HandleSliderPlane/HandleSliderDisc
  - update() implementation
 
-ScriptHandleManager
- - Needs to be started up somewhere
-
-SceneEditorWidget
- - Need to glue everything together
-
 ----------------------------------------------------
 STAGE 2
 Implement RotateHandle & ScaleHandle in C#
@@ -92,35 +81,6 @@ Find ones with Renderable components
 Retrieve Meshes, and world transforms from them
 Draw that same mesh with either a wireframe or a grayed out shader with a slight depth bias
 
-----------------------------------------------------------------------
-SceneView editor flow:
-  Hook up gizmo, handle and selection rendering methods to be executed after the scene is rendered
-  Calculate mouse coords manually relative to the window and to the render texture GUI element
-     - Don't use GUI events as we require more precise control (do we?)
-
-  Detect mouse clicks on the scene render target
-      Forward those mouse coordinates to HandleManager
-      It checks if screen ray intersects any handles and returns the handle if it does
-         If handle is found it is activated and method returns
-         Otherwise we mark the coordinates as selection start
-
-  Detect mouse drag on the scene render target
-    - If we have an active handle
-         Forward mouse coordinates to the active handle so it can do its thing
-         return
-    - Otherwise its assumed we are dragging a selection
-         Update selection endpoint and send it to ScenePicking
-         Use Selection to select picked objects if any
-         return
-
-  Detect mouse release on scene render target
-     If we have an active handle
-        Clear active handle
-        return
-     Otheriwse its assumed we are dragging a selection
-        Do nothing
-        return
-
 ---------------------------------------------------------------------
 Multi-resources