Reverted code to v1.0.0 Mac App Store Release

Source/Configuration/Shared.xcconfig

@@ -1,4 +1,4 @@
 HARDCODED_DEVELOPER_ID=Developer ID Application: LateNite Films Pty Ltd
 HARDCODED_COPYRIGHT=Copyright © LateNite Films Pty Ltd 2022-2023. All Rights Reserved.
-HARDCODED_VERSION=1.0.1
-HARDCODED_BUILD=12
+HARDCODED_VERSION=1.0.0
+HARDCODED_BUILD=11

Source/Frameworks/gyroflow/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gyroflow-toolbox"
-version = "1.0.1"
+version = "1.0.0"
 authors = ["Chris Hocking <[email protected]>", "Adrian <[email protected]>"]
 edition = "2021"
 
@@ -16,7 +16,7 @@ gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git" }
 log = "0.4.17"
 oslog = "0.2.0"
 lazy_static = "1.4"
-lru = "0.10"
-nalgebra = { version = "0.32", features = ["serde-serialize"] }
+lru = "0.8"
+nalgebra = { version = "0.31", features = ["serde-serialize"] }
 once_cell = "1.16.0"
 metal = "0.24.0"

Source/Frameworks/gyroflow/inc/gyroflow.h

@@ -23,12 +23,6 @@ const char* processFrame(
  double fov,
  double smoothness,
  double lens_correction,
- double horizon_lock,
- double horizon_roll,
- double position_offset_x,
- double position_offset_y,
- double video_rotation,
- double video_speed, 
  void *in_mtl_texture,
  void *out_mtl_texture,
  void *command_queue

Source/Frameworks/gyroflow/src/lib.rs

@@ -46,12 +46,6 @@ pub extern "C" fn processFrame(
  fov: f64,
  smoothness: f64,
  lens_correction: f64,
- horizon_lock: f64,
- horizon_roll: f64,
- position_offset_x: f64,
- position_offset_y: f64,
- video_rotation: f64,
- video_speed: f64,
  in_mtl_tex: *mut std::ffi::c_void,
  out_mtl_tex: *mut std::ffi::c_void,
  command_queue: *mut std::ffi::c_void,
@@ -143,7 +137,7 @@ pub extern "C" fn processFrame(
  // Force the background color to transparent:
  //---------------------------------------------------------
  let background_color: Vector4<f32> = Vector4::new(0.0, 0.0, 0.0, 0.0);
- manager.set_background_color(background_color);
+ manager.stabilization.write().set_background(background_color);
  },
  Err(e) => {
  //---------------------------------------------------------
@@ -178,70 +172,27 @@ pub extern "C" fn processFrame(
  params.lens_correction_amount = lens_correction;
  params_changed = true;
  }
-
- //---------------------------------------------------------
- // Set the Position Offset X:
- //--------------------------------------------------------- 
- if params.adaptive_zoom_center_offset.0 != position_offset_x / 100.0 {
- params.adaptive_zoom_center_offset.0 = position_offset_x / 100.0;
- params_changed = true;
- }
-
- //---------------------------------------------------------
- // Set the Position Offset Y:
- //---------------------------------------------------------
- if params.adaptive_zoom_center_offset.1 != position_offset_y / 100.0 {
- params.adaptive_zoom_center_offset.1 = position_offset_y / 100.0;
- params_changed = true;
- }
-
- //---------------------------------------------------------
- // Set the Video Rotation:
- //---------------------------------------------------------
- if params.video_rotation != video_rotation {
- params.video_rotation = video_rotation;
- params_changed = true;
- }
-
- //---------------------------------------------------------
- // Set the Video Speed:
- //--------------------------------------------------------- 
- if params.video_speed != video_speed / 100.0 {
- params.video_speed = video_speed / 100.0;
- params_changed = true;
- }
  }
 
  //---------------------------------------------------------
- // Set the Smoothing Parameters:
+ // Set the Smoothness:
  //---------------------------------------------------------
  {
- //---------------------------------------------------------
- // Set the Smoothness:
- //---------------------------------------------------------
  let mut smoothing = manager.smoothing.write();
  if smoothing.current().get_parameter("smoothness") != smoothness {
  smoothing.current_mut().set_parameter("smoothness", smoothness);
  params_changed = true;
  }
-
- //---------------------------------------------------------
- // Set the Horizon Lock:
- //---------------------------------------------------------
- if smoothing.horizon_lock.lock_enabled != (horizon_lock > 0.0) || smoothing.horizon_lock.horizonlockpercent != horizon_lock || smoothing.horizon_lock.horizonroll != horizon_roll {
- smoothing.horizon_lock.set_horizon(horizon_lock, horizon_roll);
- params_changed = true;
- }
  }
-
+  
  //---------------------------------------------------------
  // If something has changed, Invalidate & Recompute, to
  // make sure everything is up-to-date:
  //---------------------------------------------------------
  if params_changed {
  manager.invalidate_smoothing();
  manager.recompute_blocking();
- manager.params.write().calculate_ramped_timestamps(&manager.keyframes.read(), false, false);
+ manager.params.write().calculate_ramped_timestamps(&manager.keyframes.read());
  }
 
  //---------------------------------------------------------
@@ -258,13 +209,13 @@ pub extern "C" fn processFrame(
  size: (output_width, output_height, input_stride),
  rect: None,
  data: BufferSource::Metal { texture: in_mtl_tex as *mut metal::MTLTexture, command_queue: command_queue as *mut metal::MTLCommandQueue },
- texture_copy: false
+ texture_copy: true
  },
  output: BufferDescription {
  size: (output_width, output_height, output_stride),
  rect: None,
  data: BufferSource::Metal { texture: out_mtl_tex as *mut metal::MTLTexture, command_queue: command_queue as *mut metal::MTLCommandQueue },
- texture_copy: false
+ texture_copy: true
  }
  };
 

Source/Gyroflow.xcodeproj/project.pbxproj

@@ -20,6 +20,7 @@
  2239AB372943F8F600028B77 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2239AB352943F8F600028B77 /* InfoPlist.strings */; };
  2239AB392943F8F600028B77 /* MetalDeviceCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239AB382943F8F600028B77 /* MetalDeviceCache.m */; };
  2239AB3C2943F8F600028B77 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2239AB3A2943F8F600028B77 /* MainMenu.xib */; };
+ 2239AB412943F8F600028B77 /* TileableRemoteGyroflow.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2239AB402943F8F600028B77 /* TileableRemoteGyroflow.metal */; };
  2239AB452943F8F600028B77 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239AB442943F8F600028B77 /* main.m */; };
  2239AB492943F8F600028B77 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2239AB472943F8F600028B77 /* InfoPlist.strings */; };
  2239AB4C2943F8F600028B77 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2239AB4A2943F8F600028B77 /* Localizable.strings */; };
@@ -29,9 +30,10 @@
  2239AB792945979800028B77 /* libgyroflow_toolbox.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 2239AB772945979800028B77 /* libgyroflow_toolbox.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
  224321B629615B0C00EA591A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 224321B529615B0C00EA591A /* Assets.xcassets */; };
  224321B829615C4400EA591A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 224321B729615C4400EA591A /* Assets.xcassets */; };
- 22442A1B29C5A097006A56D6 /* CustomDropZoneView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22442A1929C5A097006A56D6 /* CustomDropZoneView.m */; };
- 2264334F29864BDF002C0F9E /* CustomButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2264334D29864BDF002C0F9E /* CustomButtonView.m */; };
+ 228E9E1829517D8200B2571E /* ImportGyroflowProjectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 228E9E1729517D8200B2571E /* ImportGyroflowProjectView.m */; };
+ 228E9E1C2951DB6900B2571E /* ReloadGyroflowProjectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 228E9E1B2951DB6900B2571E /* ReloadGyroflowProjectView.m */; };
  22DAC75F2953B1A7001F2E06 /* GyroflowDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = 22DAC75E2953B1A7001F2E06 /* GyroflowDocument.icns */; };
+ 22DAC7622953CD4F001F2E06 /* LaunchGyroflowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DAC7602953CD4F001F2E06 /* LaunchGyroflowView.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -95,7 +97,9 @@
  2239AB362943F8F600028B77 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  2239AB382943F8F600028B77 /* MetalDeviceCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MetalDeviceCache.m; sourceTree = "<group>"; };
  2239AB3B2943F8F600028B77 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+ 2239AB402943F8F600028B77 /* TileableRemoteGyroflow.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = TileableRemoteGyroflow.metal; sourceTree = "<group>"; };
  2239AB422943F8F600028B77 /* SandboxEntitlements.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SandboxEntitlements.entitlements; sourceTree = "<group>"; };
+ 2239AB432943F8F600028B77 /* TileableRemoteGyroflowShaderTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TileableRemoteGyroflowShaderTypes.h; sourceTree = "<group>"; };
  2239AB442943F8F600028B77 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
  2239AB462943F8F600028B77 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
  2239AB482943F8F600028B77 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -109,12 +113,14 @@
  2239AB7C2945A69100028B77 /* lib.rs */ = {isa = PBXFileReference; lastKnownFileType = text; name = lib.rs; path = Frameworks/gyroflow/src/lib.rs; sourceTree = SOURCE_ROOT; };
  224321B529615B0C00EA591A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
  224321B729615C4400EA591A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
- 22442A1929C5A097006A56D6 /* CustomDropZoneView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomDropZoneView.m; sourceTree = "<group>"; };
- 22442A1A29C5A097006A56D6 /* CustomDropZoneView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomDropZoneView.h; sourceTree = "<group>"; };
- 2264334D29864BDF002C0F9E /* CustomButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomButtonView.m; sourceTree = "<group>"; };
- 2264334E29864BDF002C0F9E /* CustomButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomButtonView.h; sourceTree = "<group>"; };
+ 228E9E1629517D8200B2571E /* ImportGyroflowProjectView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImportGyroflowProjectView.h; sourceTree = "<group>"; };
+ 228E9E1729517D8200B2571E /* ImportGyroflowProjectView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImportGyroflowProjectView.m; sourceTree = "<group>"; };
  228E9E1929517DDA00B2571E /* GyroflowConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GyroflowConstants.h; sourceTree = "<group>"; };
+ 228E9E1A2951DB6800B2571E /* ReloadGyroflowProjectView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReloadGyroflowProjectView.h; sourceTree = "<group>"; };
+ 228E9E1B2951DB6900B2571E /* ReloadGyroflowProjectView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReloadGyroflowProjectView.m; sourceTree = "<group>"; };
  22DAC75E2953B1A7001F2E06 /* GyroflowDocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = GyroflowDocument.icns; sourceTree = "<group>"; };
+ 22DAC7602953CD4F001F2E06 /* LaunchGyroflowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchGyroflowView.m; sourceTree = "<group>"; };
+ 22DAC7612953CD4F001F2E06 /* LaunchGyroflowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchGyroflowView.h; sourceTree = "<group>"; };
  22E4989F29492E8100580F67 /* Cargo.toml */ = {isa = PBXFileReference; lastKnownFileType = text; name = Cargo.toml; path = Frameworks/gyroflow/Cargo.toml; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -202,6 +208,7 @@
  children = (
  228E9E13294E815E00B2571E /* Code */,
  228E9E12294E815200B2571E /* Metal Device Cache */,
+ 228E9E14294E816D00B2571E /* Shader */,
  228E9E15294E817700B2571E /* Extras */,
  );
  path = Plugin;
@@ -275,19 +282,25 @@
  228E9E13294E815E00B2571E /* Code */ = {
  isa = PBXGroup;
  children = (
- 22442A1A29C5A097006A56D6 /* CustomDropZoneView.h */,
- 22442A1929C5A097006A56D6 /* CustomDropZoneView.m */,
- 2264334E29864BDF002C0F9E /* CustomButtonView.h */,
- 2264334D29864BDF002C0F9E /* CustomButtonView.m */,
  228E9E1929517DDA00B2571E /* GyroflowConstants.h */,
  2239AB2E2943F8F600028B77 /* GyroflowPlugIn.h */,
  2239AB312943F8F600028B77 /* GyroflowPlugIn.m */,
  2239AB58294400CE00028B77 /* GyroflowParameters.h */,
  2239AB56294400B500028B77 /* GyroflowParameters.m */,
+ 22DAC7632953D1CF001F2E06 /* Custom Views */,
  );
  name = Code;
  sourceTree = "<group>";
  };
+ 228E9E14294E816D00B2571E /* Shader */ = {
+ isa = PBXGroup;
+ children = (
+ 2239AB402943F8F600028B77 /* TileableRemoteGyroflow.metal */,
+ 2239AB432943F8F600028B77 /* TileableRemoteGyroflowShaderTypes.h */,
+ );
+ name = Shader;
+ sourceTree = "<group>";
+ };
  228E9E15294E817700B2571E /* Extras */ = {
  isa = PBXGroup;
  children = (
@@ -300,6 +313,19 @@
  name = Extras;
  sourceTree = "<group>";
  };
+ 22DAC7632953D1CF001F2E06 /* Custom Views */ = {
+ isa = PBXGroup;
+ children = (
+ 22DAC7612953CD4F001F2E06 /* LaunchGyroflowView.h */,
+ 22DAC7602953CD4F001F2E06 /* LaunchGyroflowView.m */,
+ 228E9E1629517D8200B2571E /* ImportGyroflowProjectView.h */,
+ 228E9E1729517D8200B2571E /* ImportGyroflowProjectView.m */,
+ 228E9E1A2951DB6800B2571E /* ReloadGyroflowProjectView.h */,
+ 228E9E1B2951DB6900B2571E /* ReloadGyroflowProjectView.m */,
+ );
+ name = "Custom Views";
+ sourceTree = "<group>";
+ };
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -459,11 +485,13 @@
  isa = PBXSourcesBuildPhase;
  buildActionMask = 2147483647;
  files = (
+ 228E9E1C2951DB6900B2571E /* ReloadGyroflowProjectView.m in Sources */,
  2239AB392943F8F600028B77 /* MetalDeviceCache.m in Sources */,
- 2264334F29864BDF002C0F9E /* CustomButtonView.m in Sources */,
- 22442A1B29C5A097006A56D6 /* CustomDropZoneView.m in Sources */,
+ 228E9E1829517D8200B2571E /* ImportGyroflowProjectView.m in Sources */,
+ 2239AB412943F8F600028B77 /* TileableRemoteGyroflow.metal in Sources */,
  2239AB452943F8F600028B77 /* main.m in Sources */,
  2239AB57294400B500028B77 /* GyroflowParameters.m in Sources */,
+ 22DAC7622953CD4F001F2E06 /* LaunchGyroflowView.m in Sources */,
  2239AB322943F8F600028B77 /* GyroflowPlugIn.m in Sources */,
  );
  runOnlyForDeploymentPostprocessing = 0;