From 25906d1b2b170aca2e2eca184ed43d197e27ed08 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sun, 22 May 2022 16:10:51 -0700 Subject: [PATCH 1/3] Project file: Remove team ID that leaked in I accidentally forgot to enable my hooks after cloning on a new macOS installation. Signed-off-by: Christopher Snowhill --- Cog.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 2e2f7a442..fa3aba7ac 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -2028,7 +2028,7 @@ LastUpgradeCheck = 1250; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = N6E749HJ2X; + DevelopmentTeam = ""; LastSwiftMigration = 1220; ProvisioningStyle = Automatic; }; -- 2.45.2 From 4f1ea02359ce586d7487d1c673913e355032dd05 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sun, 22 May 2022 16:12:12 -0700 Subject: [PATCH 2/3] README: Add directions for Git hooks path Since we use a non-default path in the repository to store shared hooks, it needs to be configured on a freshly cloned repository before it can be usable. Yeah, I forgot to follow my own directions before working on the project for quite some time. The error crept in at the following commit: 2aa3ddd545f376fb6d1c6932cafc5e701a09a47e - Icon replacement, and team ID Signed-off-by: Christopher Snowhill --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 3f6c7a540..56481d2de 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,12 @@ git submodule update --init --recursive Setup your `DEVELOPMENT_TEAM` like described in [Xcode-config/Shared.xcconfig](https://github.com/losnoco/Cog/blob/main/Xcode-config/Shared.xcconfig) to build the project. +(Add 2022-05-22) Also, be sure to configure the hooks path, so you won't accidentally commit your team ID to a project file: + +``` +git config core.hooksPath .githooks +``` + # Screenshots ## Main window and Info Inspector -- 2.45.2 From a58b11dc902c66fbb472bde2e4f22efe2849478f Mon Sep 17 00:00:00 2001 From: Dzmitry Neviadomski Date: Mon, 23 May 2022 01:50:09 +0300 Subject: [PATCH 3/3] [Visualizer] Adjust 2d projection camera angles. --- Visualization/SpectrumView.m | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/Visualization/SpectrumView.m b/Visualization/SpectrumView.m index 64577b285..8d2c4a60f 100644 --- a/Visualization/SpectrumView.m +++ b/Visualization/SpectrumView.m @@ -29,6 +29,11 @@ extern NSString *CogPlaybackDidStopNotficiation; NSColor *backgroundColor; ddb_analyzer_t _analyzer; ddb_analyzer_draw_data_t _draw_data; + + SCNVector3 cameraPosition2d; + SCNVector3 cameraEulerAngles2d; + SCNVector3 cameraPosition3d; + SCNVector3 cameraEulerAngles3d; } @end @@ -73,7 +78,17 @@ extern NSString *CogPlaybackDidStopNotficiation; SCNNode *rootNode = [[self scene] rootNode]; SCNNode *cameraNode = [rootNode childNodeWithName:@"camera" recursively:NO]; SCNCamera *camera = [cameraNode camera]; - [camera setUsesOrthographicProjection:projectionMode]; + if (projectionMode) { + cameraNode.eulerAngles = cameraEulerAngles2d; + cameraNode.position = cameraPosition2d; + camera.usesOrthographicProjection = YES; + camera.orthographicScale = 0.6; + } else { + cameraNode.eulerAngles = cameraEulerAngles3d; + cameraNode.position = cameraPosition3d; + camera.usesOrthographicProjection = NO; + camera.orthographicScale = 1.0; + } NSValueTransformer *colorToValueTransformer = [NSValueTransformer valueTransformerForName:@"ColorToValueTransformer"]; @@ -111,6 +126,13 @@ extern NSString *CogPlaybackDidStopNotficiation; SCNScene *theScene = [SCNScene sceneNamed:@"Scenes.scnassets/Spectrum.scn"]; [self setScene:theScene]; + SCNNode *rootNode = [[self scene] rootNode]; + SCNNode *cameraNode = [rootNode childNodeWithName:@"camera" recursively:NO]; + cameraPosition2d = SCNVector3Make(0.0, 0.5, 1.0); + cameraEulerAngles2d = SCNVector3Zero; + // Save initial camera position from SceneKit file. + cameraPosition3d = cameraNode.position; + cameraEulerAngles3d = cameraNode.eulerAngles; [self updateControls]; bandsReset = NO; -- 2.45.2