Merge pull request #26 from latenitefilms/v1.1.4

Merge latest v1.1.4 code into main

Scripts/copy_lens_profiles.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Define the path to the Cargo.toml file
+cargo_file="$HOME/Documents/GitHub/GyroflowToolbox/Source/Frameworks/gyroflow/Cargo.toml"
+
+# Extract the rev value for gyroflow-core
+rev=$(grep 'gyroflow-core' $cargo_file | grep 'rev' | cut -d '"' -f 4)
+
+# Check if the rev value is extracted
+if [ -z "$rev" ]; then
+ echo "Failed to extract rev value from Cargo.toml"
+ exit 1
+fi
+
+# Define source and destination directories
+source_dir="$HOME/.cargo/git/checkouts/gyroflow-e2875b874191d028/$rev/resources/camera_presets"
+destination_dir="$HOME/Documents/GitHub/GyroflowToolbox/Source/Gyroflow/Plugin/Resources/Lens Profiles"
+
+# Copy the contents, replacing any existing files and folders
+cp -R "$source_dir"/* "$destination_dir"
+
+# Check if the copy operation was successful
+if [ $? -eq 0 ]; then
+ echo "Files copied successfully."
+else
+ echo "Failed to copy files."
+fi

Scripts/trash_gyroflow_core_fingerprint_and_logs.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm -rf /Users/chrishocking/Documents/GitHub/GyroflowToolbox/Source/Frameworks/gyroflow/target/release/.fingerprint/gyroflow* || true
+rm "/Users/chrishocking/Library/Containers/com.latenitefilms.GyroflowToolbox.Renderer/Data/Library/Application Support/FxPlug.log" || true
+rm "/Users/chrishocking/Library/Containers/com.latenitefilms.GyroflowToolbox.Renderer/Data/Library/Application Support/GyroflowCore.log" || true

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.1.3
-HARDCODED_BUILD=17 // Preparing for v1.1.3 (Build 17)
+HARDCODED_VERSION=1.1.4
+HARDCODED_BUILD=18 // Preparing for v1.1.4 (Build 18)

Source/Frameworks/gyroflow/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "gyroflow-toolbox"
-version = "1.1.1"
+version = "1.1.4"
 authors = ["Chris Hocking <[email protected]>", "Adrian <[email protected]>"]
 edition = "2021"
-description = "Connects the Gyroflow Toolbox FxPlug4 API to the gyroflow_core Rust Engine"
+description = "Connects the Gyroflow Toolbox FxPlug4 API to the Gyroflow Core Rust Engine"
 
 [lib]
 crate-type =["cdylib"]
@@ -13,12 +13,14 @@ argh = "*"
 serde = "1.0"
 serde_json = "1.0"
 libc = "0.2"
-gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git", default-features = false, rev = "49c2ec9", features = ["bundle-lens-profiles"] }
+gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git", default-features = false, rev = "2b3332d", features = ["bundle-lens-profiles"] }
 log = "0.4.17"
 oslog = "0.2.0"
 lazy_static = "1.4.0"
-lru = "0.11"
+lru = "0.12"
 nalgebra = { version = "0.32", features = ["serde-serialize"] }
 once_cell = "1.16.0"
-metal = { version = "0.26.0" }
+metal = { version = "0.27" }
 block2 = "0.2.0"
+simplelog = { git = "https://github.com/Drakulix/simplelog.rs.git", rev = "4ef071d" }
+log-panics = { version = "2.1", features = ["with-backtrace"]}

Source/Frameworks/gyroflow/inc/gyroflow.h

@@ -9,6 +9,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+//---------------------------------------------------------
+// Start the logger:
+//---------------------------------------------------------
+void startLogger(
+ const char* log_file_path
+);
+
 //---------------------------------------------------------
 // Process a frame:
 //---------------------------------------------------------
@@ -81,9 +88,9 @@ const char* hasAccurateTimestamps(
 );
 
 //---------------------------------------------------------
-// Is an official lens loaded in the Gyroflow Project?
+// Is a lens profile loaded in the Gyroflow Project?
 //---------------------------------------------------------
-const char* isOfficialLensLoaded(
+const char* isLensProfileLoaded(
  const char* gyroflow_project_data
 );