Merge pull request #14 from cwhitney/develop

Added SS version string
cwhitney · Jan 22, 2018 · 95fe8a5 · 95fe8a5
2 parents 15e664c + e5cc33f
commit 95fe8a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/include/Version.h b/include/Version.h
@@ -0,0 +1,6 @@
+
+//  SILVERSPRINT_VERSION % 100 is the patch level
+//  SILVERSPRINT_VERSION / 100 % 1000 is the minor version
+//  SILVERSPRINT_VERSION / 100000 is the major version
+#define SILVERSPRINT_VERSION        104
+#define SILVERSPRINT_VERSION_STR    "0.1.4"
diff --git a/include/views/SettingsView.h b/include/views/SettingsView.h
@@ -13,6 +13,8 @@
 #include "cinder/gl/gl.h"
 #include "cinder/Log.h"
 
+#include "Version.h"
+
 #include "data/StateManager.h"
 #include "data/Model.h"
 #include "data/GFXGlobal.h"

diff --git a/src/views/SettingsView.cpp b/src/views/SettingsView.cpp
@@ -232,5 +232,9 @@ void SettingsView::draw()
         {
             mMphKphToggle->draw();
         }
+        {
+            gl::ScopedColor scGr( Color::gray(0.55) );
+            tFont->drawString("SILVERSPRINT VERSION: " + std::string(SILVERSPRINT_VERSION_STR), vec2(60, 1080- 20));
+        }
     }
 }
diff --git a/xcode/SilverSprint.xcodeproj/project.pbxproj b/xcode/SilverSprint.xcodeproj/project.pbxproj
@@ -99,6 +99,7 @@
 		CB37B3851E297897009FC93A /* ssIcn.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ssIcn.icns; path = ../resources/ssIcn.icns; sourceTree = "<group>"; };
 		CB49AA201E44F1A300820D70 /* ParticleSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticleSystem.cpp; sourceTree = "<group>"; };
 		CB49AA211E44F1A300820D70 /* ParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticleSystem.h; sourceTree = "<group>"; };
+		CB628DD120158AB3008FC730 /* Version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Version.h; path = ../include/Version.h; sourceTree = "<group>"; };
 		CB675B9D1FCB5A3100AF05DA /* ToggleBtn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ToggleBtn.cpp; sourceTree = "<group>"; };
 		CB675B9F1FCB5A3E00AF05DA /* ToggleBtn.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ToggleBtn.h; sourceTree = "<group>"; };
 		CB675BA01FCD16D200AF05DA /* Config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; };
@@ -232,6 +233,7 @@
 		29B97315FDCFA39411CA2CEA /* Headers */ = {
 			isa = PBXGroup;
 			children = (
+				CB628DD120158AB3008FC730 /* Version.h */,
 				CBF06F101C5012070064CC52 /* app */,
 				CBF06F131C5012070064CC52 /* data */,
 				CBF06F191C5012070064CC52 /* ui */,