A lot of changes

include/Render/SalmonRender/SalmonRenderInterface.h

@@ -30,6 +30,9 @@ protected:
 
 	float GlobalShadowAreaHalfSize;
 
+	cardinal BkgTexID;
+	std::string BkgShaderName;
+
 	void CalcCamPosVec();
 
 	virtual void DrawQuad(const T2DQuad& quad) = 0;
@@ -78,6 +81,11 @@ public:
 	void BeginDrawToDepthBufferGlobal(std::string& globalBufferName);
 	void BeginDrawToDepthBufferLocal(std::string& localBufferName);
 	void EndDrawToDepthBuffer();
+
+	void SetBackgroundCubemap(cardinal bkgTex) { BkgTexID = bkgTex; }
+	void SetBackgroundShader(const std::string& shaderName) { BkgShaderName = shaderName; }
+
+	void DrawBackground();
 	
 };
 

include/ScriptManager/ScriptManager.h

@@ -1,7 +1,7 @@
 #ifndef SCRIPT_MANAGER_H_INCLUDED
 #define SCRIPT_MANAGER_H_INCLUDED
 
-#include "sqplus.h"
+//#include "sqplus.h"
 #include <iostream>
 #include <string>
 
@@ -44,22 +44,23 @@ public:
 };
 
 
+
 class TScriptManager : public TSerializeInterface
 {
 protected:	
-	HSQUIRRELVM virtualMachine;
+	//HSQUIRRELVM virtualMachine;
 	std::map<std::string, TScriptInfo> FuncInfoMap;
 
 	template<typename T1,typename T2>
 	void RegisterFunc(T1& object, T2 method, const std::string& funcName)
 	{
-		SqPlus::RegisterGlobal(virtualMachine, object, method, _SC(funcName.c_str()));
+		//SqPlus::RegisterGlobal(virtualMachine, object, method, _SC(funcName.c_str()));
 	}
 
 	template<typename T>
 	void RegisterFunc(T globalFunc, const std::string& funcName)
 	{
-		SqPlus::RegisterGlobal(virtualMachine, globalFunc, _SC(funcName.c_str()));
+		//SqPlus::RegisterGlobal(virtualMachine, globalFunc, _SC(funcName.c_str()));
 	}
 
 public:
@@ -103,9 +104,9 @@ public:
 
 
 
-void SQ_Print(const SQChar *inString);
-void SQ_PrintWidgetList();
-void SQ_MoveWidget(const SQChar *widgetName, float x, float y);
+//void SQ_Print(const SQChar *inString);
+//void SQ_PrintWidgetList();
+//void SQ_MoveWidget(const SQChar *widgetName, float x, float y);
 //void SQ_PrintTextureList();
 //void SQ_PrintAnimationList();
 

include/SmartValueManager/SmartValueManager.h

@@ -41,7 +41,7 @@ public:
 	}
 
 	template<typename TYPENAME>
-	boost::signal<void(const TYPENAME&)>& GetSignal(const std::string& dictName, const std::string& valueName)
+	boost::signals2::signal<void(const TYPENAME&)>& GetSignal(const std::string& dictName, const std::string& valueName)
 	{
 		return boost::get<std::shared_ptr<TBindableVar<TYPENAME>>>(GetSmartValue(dictName, valueName))->OnVarChanged;
 	}

include/Utils/BindableVar.h

@@ -1,7 +1,7 @@
 #ifndef BINDABLE_VAR_H_INCLUDED
 #define BINDABLE_VAR_H_INCLUDED
 
-#include "boost/signal.hpp"
+#include "boost/signals2.hpp"
 #include "boost/variant.hpp"
 
 namespace SE
@@ -17,7 +17,7 @@ protected:
 
 public:
 
-	boost::signal<void(const TYPENAME&)> OnVarChanged;
+	boost::signals2::signal<void(const TYPENAME&)> OnVarChanged;
 
 	TBindableVar()
 	{

include/Utils/Utils.h

@@ -14,7 +14,7 @@ This code combines additional routines (such as console/log, exceptions, math ut
 
 #include "boost/asio.hpp"
 #include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/signal.hpp"
+#include "boost/signals2.hpp"
 
 
 #include "include/Utils/Console/Console.h"