Merge branch 'release/1.2.0'

.gitignore

@@ -15,6 +15,28 @@
 **/vc201[35]/**/[Bb]in/
 **/vc201[35]/**/[Oo]bj/
 
+# Xcode (https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore)
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/
 
@@ -152,3 +174,5 @@ $RECYCLE.BIN/
 # Mac files
 .DS_Store
 ._.DS_Store
+
+*.xcuserstate

README.md

@@ -96,4 +96,5 @@ CINDER_APP(BaseAppSampleApp, RendererGl(RendererGl::Options().msaa(4)), BaseAppS
 
 ## Notes
 
-Version 1.1.1
+Version 1.2.0
+Based on Cinder commit [0b24d643e3b19a4ae6875b92899bae9376f7a64a](https://github.com/cinder/Cinder/commit/0b24d643e3b19a4ae6875b92899bae9376f7a64a)

samples/BaseAppSample/include/Resources.h → samples/BaseAppCrossPlatform/include/Resources.h

@@ -3,5 +3,11 @@
 
 //#define RES_MY_RES			CINDER_RESOURCE( ../resources/, image_name.png, 128, IMAGE )
 
-
-
+
+
+
+
+
+
+
+

samples/BaseAppCrossPlatform/src/BaseAppCrossPlatformApp.cpp

@@ -0,0 +1,68 @@
+#include "cinder/app/App.h"
+#include "cinder/app/RendererGl.h"
+#include "cinder/gl/gl.h"
+
+#include "core/BaseApp.h"
+#include "views/TouchView.h"
+
+using namespace ci;
+using namespace ci::app;
+using namespace std;
+
+using namespace bluecadet::core;
+using namespace bluecadet::views;
+using namespace bluecadet::touch;
+
+class BaseAppCrossPlatformApp : public BaseApp {
+public:
+    static void prepareSettings(ci::app::App::Settings* settings);
+    void setup() override;
+    void update() override;
+    void draw() override;
+};
+
+void BaseAppCrossPlatformApp::prepareSettings(ci::app::App::Settings* settings) {
+    // Use this method to set up your window
+    SettingsManager::getInstance()->mFullscreen = false;
+    SettingsManager::getInstance()->mWindowSize = ivec2(1280, 720);
+    SettingsManager::getInstance()->mBorderless = false;
+
+    BaseApp::prepareSettings(settings);
+
+    // Optional: configure a multi-screen layout (defaults to 1x1 1080p landscape)
+    ScreenLayout::getInstance()->setDisplaySize(ivec2(1080, 1920));
+    ScreenLayout::getInstance()->setNumRows(1);
+    ScreenLayout::getInstance()->setNumColumns(3);
+}
+
+void BaseAppCrossPlatformApp::setup() {
+
+    BaseApp::setup();
+    BaseApp::addTouchSimulatorParams();
+
+    // Optional: configure your root view
+    getRootView()->setBackgroundColor(Color::gray(0.5f));
+
+    // Sample content
+    auto button = TouchViewRef(new TouchView());
+    button->setSize(getRootView()->getSize() * 0.75f);
+    button->setPosition((getRootView()->getSize() - button->getSize()) * 0.5f);
+    button->setBackgroundColor(ColorA(1, 0, 0));
+    button->setMultiTouchEnabled(true);
+	button->mDidBeginTouch.connect([](bluecadet::touch::TouchEvent e) { e.touchTarget->setAlpha(0.75f); });
+	button->mDidEndTouch.connect([](bluecadet::touch::TouchEvent e) { e.touchTarget->setAlpha(1.0f); });
+    getRootView()->addChild(button);
+}
+
+void BaseAppCrossPlatformApp::update() {
+    // Optional override. BaseApp::update() will update all views.
+    BaseApp::update();
+}
+
+void BaseAppCrossPlatformApp::draw() {
+    // Optional override. BaseApp::draw() will draw all views.
+    BaseApp::draw();
+}
+
+// Make sure to pass a reference to prepareSettings to configure the app correctly. MSAA and other render options are optional.
+CINDER_APP(BaseAppCrossPlatformApp, RendererGl(RendererGl::Options().msaa(4)), BaseAppCrossPlatformApp::prepareSettings);

samples/BaseAppCrossPlatform/vc2013/BaseAppCrossPlatform.sln

@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseAppCrossPlatform", "BaseAppCrossPlatform.vcxproj", "{9BDC3383-716A-4AC9-BABC-54C14253623D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Debug|Win32.Build.0 = Debug|Win32
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Release|Win32.ActiveCfg = Release|Win32
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Release|Win32.Build.0 = Release|Win32
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Debug|x64.ActiveCfg = Debug|x64
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Debug|x64.Build.0 = Debug|x64
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Release|x64.ActiveCfg = Release|x64
+		{9BDC3383-716A-4AC9-BABC-54C14253623D}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal