diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index fa3aba7ac..2e2f7a442 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -2028,7 +2028,7 @@ LastUpgradeCheck = 1250; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = ""; + DevelopmentTeam = N6E749HJ2X; LastSwiftMigration = 1220; ProvisioningStyle = Automatic; }; diff --git a/README.md b/README.md index 56481d2de..3f6c7a540 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,6 @@ 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 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;