Cleanup and version number bump

Release 0.2.10, here we come.
cochrane · Oct 3, 2019 · 392321b · 392321b
1 parent aca2acb
commit 392321b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/GLLara.xcodeproj/project.pbxproj b/GLLara.xcodeproj/project.pbxproj
@@ -1669,7 +1669,7 @@
 			attributes = {
 				CLASSPREFIX = GLL;
 				LastTestingUpgradeCheck = 0620;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = "Torsten Kammer";
 				TargetAttributes = {
 					525ACD4615F0F1A700534E7D = {
@@ -1680,10 +1680,9 @@
 			};
 			buildConfigurationList = 525ACD4115F0F1A700534E7D /* Build configuration list for PBXProject "GLLara" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				de,
 				Base,
@@ -2412,6 +2411,7 @@
 		523DE0E91604A5ED00BB9F61 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "parseItems/parseItems-Prefix.pch";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2421,6 +2421,7 @@
 		523DE0EA1604A5ED00BB9F61 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "parseItems/parseItems-Prefix.pch";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2538,8 +2539,11 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = MXAKMKWG34;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "GLLara/GLLara-Info.plist";
+				MARKETING_VERSION = 0.2.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.ferroequinologist.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -2553,8 +2557,11 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = MXAKMKWG34;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "GLLara/GLLara-Info.plist";
+				MARKETING_VERSION = 0.2.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.ferroequinologist.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

diff --git a/GLLara/GLLCameraTarget.m b/GLLara/GLLCameraTarget.m
@@ -21,6 +21,7 @@ @interface GLLCameraTarget ()
 
 @property (nonatomic, assign, readwrite) vec_float4 position;
 - (void)_updatePosition;
+- (void)_registerObserver;
 
 @end
 
@@ -40,23 +41,17 @@ + (NSSet *)keyPathsForValuesAffectingDisplayName
 - (void)awakeFromFetch
 {
     [super awakeFromFetch];
-    if (!didRegister)
-        [self addObserver:self forKeyPath:@"bones" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:contextMarker];
-    didRegister = YES;
+    [self _registerObserver];
 }
 - (void)awakeFromInsert
 {
     [super awakeFromInsert];
-    if (!didRegister)
-        [self addObserver:self forKeyPath:@"bones" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:contextMarker];
-    didRegister = YES;
+    [self _registerObserver];
 }
 - (void)awakeFromSnapshotEvents:(NSSnapshotEventType)flags
 {
     [super awakeFromSnapshotEvents:flags];
-    if (!didRegister)
-        [self addObserver:self forKeyPath:@"bones" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:contextMarker];
-    didRegister = YES;
+    [self _registerObserver];
 }
 - (void)willTurnIntoFault
 {
@@ -104,4 +99,10 @@ - (void)_updatePosition
     [self didChangeValueForKey:@"position"];
 }
 
+- (void)_registerObserver {
+    if (!didRegister)
+        [self addObserver:self forKeyPath:@"bones" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:contextMarker];
+    didRegister = YES;
+}
+
 @end
diff --git a/GLLara/GLLItemMeshState.m b/GLLara/GLLItemMeshState.m
@@ -206,6 +206,14 @@ - (void)unload
 }
 
 - (NSComparisonResult)compareTo:(GLLItemMeshState *)other {
+    // Main comparison method for sorting objects (states) to minimize state
+    // switching.
+    // For most attributes (except Alpha) the order is completely arbitrary.
+    // What matters is in what order they're checked: At the front should be
+    // state changes that are expensive, at the rear ones that are cheap because
+    // they will happen an awful lot. The current order is probably not yet
+    // optimal.
+
     BOOL selfAlpha = self.itemMesh.isUsingBlending;
     BOOL otherAlpha = other.itemMesh.isUsingBlending;
 

diff --git a/GLLara/GLLara-Info.plist b/GLLara/GLLara-Info.plist
@@ -48,11 +48,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.9</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.graphics-design</string>
 	<key>LSMinimumSystemVersion</key>