salmon-engine-core/engine
6
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ios changes

Browse Source
This commit is contained in:
vladislav.khorev committed 2017-02-27 02:26:42 +03:00
1 parent 6b67237804
commit 0bf1c60c9d
18 files changed
+116 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/GUIManager/ButtonWidget.h
+9 -9
View File
@@ -106,7 +106,7 @@ struct TSquareStatic : public TInstancingWidgetAncestor
struct TDynamicText : public TInstancingWidgetAncestor
{
protected:
boost::signals::connection SmartValueConnection;
boost::signals2::connection SmartValueConnection;
TTextParams LastTextParams;
@@ -194,16 +194,16 @@ protected:
void RefreshTextTriangleList();
boost::signals::connection InputConnection;
boost::signals2::connection InputConnection;
boost::signals::connection SetTextSlotConnection;
boost::signals2::connection SetTextSlotConnection;
public:
~TEdit();
TRenderPairList::iterator TextIterator;
boost::signal<void(std::string)> OnTextChanged;
boost::signals2::signal<void(std::string)> OnTextChanged;
virtual bool CheckClick(vec2 mousePos);
@@ -230,7 +230,7 @@ class TCheckBox : public TInstancingWidgetAncestor
protected:
bool IsChecked; //To be set immediately on tap up
boost::signals::connection SetCheckedSlotConnection;
boost::signals2::connection SetCheckedSlotConnection;
void RefreshVisibility();
public:
std::vector<TRenderPairList::iterator> StaticTextureIteratorArr;
@@ -252,7 +252,7 @@ public:
//Logic:
void SetChecked(bool isChecked);
boost::signal<void(bool)> OnSetChecked;
boost::signals2::signal<void(bool)> OnSetChecked;
static TCheckBox* CreateCheckBox(vec2 posFrom, vec2 posTo);
static TCheckBox* CreateCheckBoxWithFiller(vec2 posFrom, vec2 posTo, boost::function<void(TCheckBox*)> checkBoxFillerFunc);
@@ -274,7 +274,7 @@ class TRadioButton : public TInstancingWidgetAncestor
protected:
bool IsChecked; //To be set immediately on tap up
boost::signals::connection SetCheckedSlotConnection;
boost::signals2::connection SetCheckedSlotConnection;
void RefreshVisibility();
public:
std::vector<TRenderPairList::iterator> StaticTextureIteratorArr;
@@ -296,7 +296,7 @@ public:
//Logic:
void SetChecked(bool isChecked);
boost::signal<void(bool)> OnSetChecked;
boost::signals2::signal<void(bool)> OnSetChecked;
static TRadioButton* CreateRadioButton(vec2 posFrom, vec2 posTo);
static TRadioButton* CreateRadioButtonWithFiller(vec2 posFrom, vec2 posTo, boost::function<void(TRadioButton*)> radioButtonFillerFunc);
@@ -402,4 +402,4 @@ public:
} //namespace SE
#endif
#endif
include/GUIManager/GUIManager.h
+14 -14
View File
@@ -32,7 +32,7 @@ struct TWidgetStruct
std::shared_ptr<TInstancingWidgetAncestor> Widget;
std::map<std::string, std::shared_ptr<boost::signal<void (TSignalParam)>>> SignalMap;
std::map<std::string, std::shared_ptr<boost::signals2::signal<void (TSignalParam)>>> SignalMap;
TWidgetStruct(const std::string& name, const std::string& groupName, std::shared_ptr<TInstancingWidgetAncestor> widget, int order = 0)
: Name(name)
@@ -41,10 +41,10 @@ struct TWidgetStruct
, IsMouseDown(false)
, Widget(widget)
{
SignalMap[CONST_HOLD_SIGNAL_NAME] = std::shared_ptr<boost::signal<void (TSignalParam)>>(new boost::signal<void (TSignalParam)>());
SignalMap[CONST_CLICK_SIGNAL_NAME] = std::shared_ptr<boost::signal<void (TSignalParam)>>(new boost::signal<void (TSignalParam)>());
SignalMap[CONST_TAPDOWN_SIGNAL_NAME] = std::shared_ptr<boost::signal<void (TSignalParam)>>(new boost::signal<void (TSignalParam)>());
SignalMap[CONST_DRAG_SIGNAL_NAME] = std::shared_ptr<boost::signal<void (TSignalParam)>>(new boost::signal<void (TSignalParam)>());
SignalMap[CONST_HOLD_SIGNAL_NAME] = std::shared_ptr<boost::signals2::signal<void (TSignalParam)>>(new boost::signals2::signal<void (TSignalParam)>());
SignalMap[CONST_CLICK_SIGNAL_NAME] = std::shared_ptr<boost::signals2::signal<void (TSignalParam)>>(new boost::signals2::signal<void (TSignalParam)>());
SignalMap[CONST_TAPDOWN_SIGNAL_NAME] = std::shared_ptr<boost::signals2::signal<void (TSignalParam)>>(new boost::signals2::signal<void (TSignalParam)>());
SignalMap[CONST_DRAG_SIGNAL_NAME] = std::shared_ptr<boost::signals2::signal<void (TSignalParam)>>(new boost::signals2::signal<void (TSignalParam)>());
}
TWidgetStruct(const TWidgetStruct& widgetStruct)
@@ -142,10 +142,10 @@ protected:
public:
bool KeyboardIsOnScreen;
boost::signal<void(int)> KeyPressedSignal;
boost::signal<void(std::string)> SetTextSignal;
boost::signal<void()> OnKeyboardShowSignal;
boost::signal<void()> OnKeyboardHideSignal;
boost::signals2::signal<void(int)> KeyPressedSignal;
boost::signals2::signal<void(std::string)> SetTextSignal;
boost::signals2::signal<void()> OnKeyboardShowSignal;
boost::signals2::signal<void()> OnKeyboardHideSignal;
TGUIManager();
@@ -185,10 +185,10 @@ public:
void PrintWidgetList();
std::shared_ptr<boost::signal<void (TSignalParam)>> GetOnClickSignal(const std::string& widgetName);
std::shared_ptr<boost::signal<void (TSignalParam)>> GetOnHoldSignal(const std::string& widgetName);
std::shared_ptr<boost::signal<void (TSignalParam)>> GetSignal(const std::string& signalName, const std::string& widgetName);
std::shared_ptr<boost::signal<void (TSignalParam)>> GetOnTapDownSignal(const std::string& widgetName);
std::shared_ptr<boost::signals2::signal<void (TSignalParam)>> GetOnClickSignal(const std::string& widgetName);
std::shared_ptr<boost::signals2::signal<void (TSignalParam)>> GetOnHoldSignal(const std::string& widgetName);
std::shared_ptr<boost::signals2::signal<void (TSignalParam)>> GetSignal(const std::string& signalName, const std::string& widgetName);
std::shared_ptr<boost::signals2::signal<void (TSignalParam)>> GetOnTapDownSignal(const std::string& widgetName);
//TFunctionBinderInterface implementation:
void SQ_MoveWidget(const SQChar *widgetName, float x, float y);
@@ -199,4 +199,4 @@ public:
} //namespace SE
#endif
#endif
include/Render/SalmonRender/SalmonRenderGLES20.h
+8 -1
View File
@@ -9,6 +9,13 @@
#include <GLES2/gl2ext.h>
#endif
#ifdef TARGET_IOS
//#include <OpenGLES/AEGL.h>
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES1/glext.h>
#include <OpenGLES/ES2/glext.h>
#endif
namespace SE
{
@@ -26,4 +33,4 @@ public:
} //namespace SE
#endif
#endif
include/Render/SalmonRender/SalmonRenderIos.h
+5 -2
View File
@@ -9,12 +9,15 @@ namespace SE
class TSalmonRendererIos : public TSalmonRendererGLES20
{
protected:
GLint defaultFBO;
public:
virtual void InitOpenGL(int screenWidth, int screenHeight, float matrixWidth, float matrixHeight);
virtual void SwitchToScreen();
};
} //namespace SE
#endif
#endif
include/SmartValueManager/SmartValueManager.h
+2 -2
View File
@@ -40,7 +40,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;
}
@@ -52,4 +52,4 @@ public:
} //namespace SE
#endif
#endif
include/Utils/BindableVar.h
+4 -2
View File
@@ -1,12 +1,14 @@
#ifndef BINDABLE_VAR_H_INCLUDED
#define BINDABLE_VAR_H_INCLUDED
#include "boost/signal.hpp"
#include "boost/signals2.hpp"
#include "boost/variant.hpp"
namespace SE
{
//Must be stored in shared_ptr:
template<typename TYPENAME>
@@ -17,7 +19,7 @@ protected:
public:
boost::signal<void(const TYPENAME&)> OnVarChanged;
boost::signals2::signal<void(const TYPENAME&)> OnVarChanged;
TBindableVar()
{
include/Utils/IosApi/IosWrapper.h
+4 -1
View File
@@ -21,5 +21,8 @@ void AppOnScroll(int shiftx, int shifty, int touchNumber);
void AppOnScale(float scale);
void AppOnTapUpAfterMove(int posx, int posy, int touchNumber);
void SetBindDrawableFunc(void(*funcPtr)());
}
}
include/Utils/Network/Network.h
+11 -12
View File
@@ -10,12 +10,11 @@
#include "boost/asio.hpp"
#include "boost/date_time/posix_time/posix_time.hpp"
#include "boost/signal.hpp"
#include "boost/signals2.hpp"
#include "boost/variant.hpp"
#include "include/Utils/Network/SignalSender.h"
namespace SE
{
@@ -28,7 +27,7 @@ void SendPropertyTree(boost::asio::io_service& ioService, boost::asio::ip::tcp::
class TDataReadSignalMap
{
protected:
std::map<std::string, std::shared_ptr<boost::signal<void(boost::property_tree::ptree)>>> SignalMap;
std::map<std::string, std::shared_ptr<boost::signals2::signal<void(boost::property_tree::ptree)>>> SignalMap;
public:
void AddSlot(const std::string& nodeName, boost::function<void(boost::property_tree::ptree)> f);
@@ -69,7 +68,7 @@ public:
void HandleReadData(const boost::system::error_code& error);
boost::signal<void()> ErrorSignal;
boost::signals2::signal<void()> ErrorSignal;
};
@@ -100,9 +99,9 @@ public:
void HandleGetData(boost::property_tree::ptree pTree);
boost::signal<void()> AuthorizedSignal;
boost::signal<void(std::string, std::string)> SaveLoginPasswordSignal;
boost::signal<void()> ErrorSignal;
boost::signals2::signal<void()> AuthorizedSignal;
boost::signals2::signal<void(std::string, std::string)> SaveLoginPasswordSignal;
boost::signals2::signal<void()> ErrorSignal;
};
typedef boost::variant<std::shared_ptr<TSimpleAuthorization>> TAuthorizationVariant;
@@ -127,10 +126,10 @@ protected:
bool Opened;
public:
boost::signal<void()> OnAddressNotResolvedSignal;
boost::signal<void()> OnConnectedSignal;
boost::signal<void()> OnAutorizedSignal;
boost::signal<void()> OnDisconnectedSignal;
boost::signals2::signal<void()> OnAddressNotResolvedSignal;
boost::signals2::signal<void()> OnConnectedSignal;
boost::signals2::signal<void()> OnAutorizedSignal;
boost::signals2::signal<void()> OnDisconnectedSignal;
boost::shared_ptr<TDataReader> ClientDataReader;
@@ -158,4 +157,4 @@ public:
} //namespace SE
#endif
#endif
include/Utils/Network/SignalSender.h
+4 -2
View File
@@ -6,12 +6,14 @@
#include "boost/shared_ptr.hpp"
#include "boost/array.hpp"
#include "boost/enable_shared_from_this.hpp"
#include "boost/signal.hpp"
#include "boost/signals2.hpp"
#include "boost/thread.hpp"
#include "boost/date_time/posix_time/posix_time.hpp"
#include "boost/property_tree/ptree.hpp"
#include "boost/property_tree/xml_parser.hpp"
namespace SE
{
//Xperimental -- need to optimize this
@@ -25,7 +27,7 @@ struct TSignalSender
std::string Data;
boost::signal<void()> ErrorSignal;
boost::signals2::signal<void()> ErrorSignal;
TSignalSender(boost::asio::ip::tcp::socket& socket, int length, std::string data)
: Socket(socket)
include/Utils/ThreadUtils.h
+2 -2
View File
@@ -2,7 +2,7 @@
#define THREAD_UTILS_H_INCLUDED
#include "boost/asio.hpp"
#include "boost/signal.hpp"
#include "boost/signals2.hpp"
#include "boost/thread.hpp"
@@ -46,4 +46,4 @@ namespace SE
} //namespace SE
#endif
#endif
include/Utils/Utils.h
+3 -2
View File
@@ -14,7 +14,8 @@ 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"
@@ -42,4 +43,4 @@ This code combines additional routines (such as console/log, exceptions, math ut
#endif
#endif
#endif