Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Claude
|
25766959f1 | ||
 admin
|
5f949121bf | ||
|
Claude
|
a22c238dc4 | ||
|
admin
|
b607a9cd8a | ||
|
Claude
|
9e501cc4e8 | ||
|
admin
|
8d4afcf0ad | ||
|
Claude
|
1e153f2f85 | ||
|
admin
|
20904e2a96 | ||
|
admin
|
841d1c09fc | ||
|
admin
|
3dd5a1891f | ||
|
admin
|
e4e08037c3 |
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,524 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 56;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
A10000001 /* FT991A_RemoteApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000001; };
|
||||
A10000002 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000002; };
|
||||
A10000003 /* ModernRadioView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000003; };
|
||||
A10000004 /* SkeuomorphRadioView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000004; };
|
||||
A10000005 /* DebugPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000005; };
|
||||
A10000006 /* LogPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000006; };
|
||||
A10000007 /* AudioPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000007; };
|
||||
A10000008 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000008; };
|
||||
A10000009 /* MenuBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000009; };
|
||||
A10000010 /* RadioState.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000010; };
|
||||
A10000011 /* CATCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000011; };
|
||||
A10000012 /* QSOEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000012; };
|
||||
A10000013 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000013; };
|
||||
A10000014 /* SerialPortManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000014; };
|
||||
A10000015 /* CATProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000015; };
|
||||
A10000016 /* CSVManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000016; };
|
||||
A10000017 /* AudioRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000017; };
|
||||
A10000018 /* RadioViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000018; };
|
||||
A10000019 /* LogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000019; };
|
||||
A10000020 /* SettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000020; };
|
||||
A10000021 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20000021; };
|
||||
A10000022 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A20000022; };
|
||||
A10000023 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A20000023; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
A20000001 /* FT991A_RemoteApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FT991A_RemoteApp.swift; sourceTree = "<group>"; };
|
||||
A20000002 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
|
||||
A20000003 /* ModernRadioView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModernRadioView.swift; sourceTree = "<group>"; };
|
||||
A20000004 /* SkeuomorphRadioView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeuomorphRadioView.swift; sourceTree = "<group>"; };
|
||||
A20000005 /* DebugPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugPanel.swift; sourceTree = "<group>"; };
|
||||
A20000006 /* LogPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogPanel.swift; sourceTree = "<group>"; };
|
||||
A20000007 /* AudioPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPanel.swift; sourceTree = "<group>"; };
|
||||
A20000008 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
|
||||
A20000009 /* MenuBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarView.swift; sourceTree = "<group>"; };
|
||||
A20000010 /* RadioState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioState.swift; sourceTree = "<group>"; };
|
||||
A20000011 /* CATCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CATCommand.swift; sourceTree = "<group>"; };
|
||||
A20000012 /* QSOEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QSOEntry.swift; sourceTree = "<group>"; };
|
||||
A20000013 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
|
||||
A20000014 /* SerialPortManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialPortManager.swift; sourceTree = "<group>"; };
|
||||
A20000015 /* CATProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CATProtocol.swift; sourceTree = "<group>"; };
|
||||
A20000016 /* CSVManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSVManager.swift; sourceTree = "<group>"; };
|
||||
A20000017 /* AudioRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioRouter.swift; sourceTree = "<group>"; };
|
||||
A20000018 /* RadioViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioViewModel.swift; sourceTree = "<group>"; };
|
||||
A20000019 /* LogViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogViewModel.swift; sourceTree = "<group>"; };
|
||||
A20000020 /* SettingsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsController.swift; sourceTree = "<group>"; };
|
||||
A20000021 /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
|
||||
A20000022 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
A20000023 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
A20000024 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
A20000025 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
A20000026 /* FT991A_Remote.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FT991A_Remote.entitlements; sourceTree = "<group>"; };
|
||||
A30000001 /* FT991A-Remote.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FT991A-Remote.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
A40000001 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
A50000001 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A50000002 /* FT991A-Remote */,
|
||||
A50000003 /* Products */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000002 /* FT991A-Remote */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000001 /* FT991A_RemoteApp.swift */,
|
||||
A50000004 /* Models */,
|
||||
A50000005 /* Services */,
|
||||
A50000006 /* ViewModels */,
|
||||
A50000007 /* Views */,
|
||||
A50000008 /* Utilities */,
|
||||
A20000022 /* Assets.xcassets */,
|
||||
A20000025 /* Info.plist */,
|
||||
A20000026 /* FT991A_Remote.entitlements */,
|
||||
);
|
||||
path = "FT991A-Remote";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000003 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A30000001 /* FT991A-Remote.app */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000004 /* Models */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000010 /* RadioState.swift */,
|
||||
A20000011 /* CATCommand.swift */,
|
||||
A20000012 /* QSOEntry.swift */,
|
||||
A20000013 /* Settings.swift */,
|
||||
);
|
||||
path = Models;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000005 /* Services */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000014 /* SerialPortManager.swift */,
|
||||
A20000015 /* CATProtocol.swift */,
|
||||
A20000016 /* CSVManager.swift */,
|
||||
A20000017 /* AudioRouter.swift */,
|
||||
);
|
||||
path = Services;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000006 /* ViewModels */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000018 /* RadioViewModel.swift */,
|
||||
A20000019 /* LogViewModel.swift */,
|
||||
A20000020 /* SettingsController.swift */,
|
||||
);
|
||||
path = ViewModels;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000007 /* Views */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000002 /* MainView.swift */,
|
||||
A50000009 /* ModernView */,
|
||||
A50000010 /* SkeuomorphView */,
|
||||
A50000011 /* Panels */,
|
||||
A50000012 /* Settings */,
|
||||
A50000013 /* MenuBar */,
|
||||
);
|
||||
path = Views;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000008 /* Utilities */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000021 /* Logger.swift */,
|
||||
A50000014 /* Localization */,
|
||||
);
|
||||
path = Utilities;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000009 /* ModernView */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000003 /* ModernRadioView.swift */,
|
||||
);
|
||||
path = ModernView;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000010 /* SkeuomorphView */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000004 /* SkeuomorphRadioView.swift */,
|
||||
);
|
||||
path = SkeuomorphView;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000011 /* Panels */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000005 /* DebugPanel.swift */,
|
||||
A20000006 /* LogPanel.swift */,
|
||||
A20000007 /* AudioPanel.swift */,
|
||||
);
|
||||
path = Panels;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000012 /* Settings */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000008 /* SettingsView.swift */,
|
||||
);
|
||||
path = Settings;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000013 /* MenuBar */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000009 /* MenuBarView.swift */,
|
||||
);
|
||||
path = MenuBar;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
A50000014 /* Localization */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A20000023 /* Localizable.strings */,
|
||||
);
|
||||
path = Localization;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
A60000001 /* FT991A-Remote */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = A70000001;
|
||||
buildPhases = (
|
||||
A80000001 /* Sources */,
|
||||
A40000001 /* Frameworks */,
|
||||
A90000001 /* Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = "FT991A-Remote";
|
||||
productName = "FT991A-Remote";
|
||||
productReference = A30000001 /* FT991A-Remote.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
||||
/* Begin PBXProject section */
|
||||
AB0000001 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
BuildIndependentTargetsInParallel = 1;
|
||||
LastSwiftUpdateCheck = 1500;
|
||||
LastUpgradeCheck = 1500;
|
||||
TargetAttributes = {
|
||||
A60000001 = {
|
||||
CreatedOnToolsVersion = 15.0;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = AC0000001;
|
||||
compatibilityVersion = "Xcode 14.0";
|
||||
developmentRegion = de;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
de,
|
||||
en,
|
||||
Base,
|
||||
);
|
||||
mainGroup = A50000001;
|
||||
productRefGroup = A50000003 /* Products */;
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
A60000001 /* FT991A-Remote */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXResourcesBuildPhase section */
|
||||
A90000001 /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
A10000022 /* Assets.xcassets in Resources */,
|
||||
A10000023 /* Localizable.strings in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
A80000001 /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
A10000001 /* FT991A_RemoteApp.swift in Sources */,
|
||||
A10000002 /* MainView.swift in Sources */,
|
||||
A10000003 /* ModernRadioView.swift in Sources */,
|
||||
A10000004 /* SkeuomorphRadioView.swift in Sources */,
|
||||
A10000005 /* DebugPanel.swift in Sources */,
|
||||
A10000006 /* LogPanel.swift in Sources */,
|
||||
A10000007 /* AudioPanel.swift in Sources */,
|
||||
A10000008 /* SettingsView.swift in Sources */,
|
||||
A10000009 /* MenuBarView.swift in Sources */,
|
||||
A10000010 /* RadioState.swift in Sources */,
|
||||
A10000011 /* CATCommand.swift in Sources */,
|
||||
A10000012 /* QSOEntry.swift in Sources */,
|
||||
A10000013 /* Settings.swift in Sources */,
|
||||
A10000014 /* SerialPortManager.swift in Sources */,
|
||||
A10000015 /* CATProtocol.swift in Sources */,
|
||||
A10000016 /* CSVManager.swift in Sources */,
|
||||
A10000017 /* AudioRouter.swift in Sources */,
|
||||
A10000018 /* RadioViewModel.swift in Sources */,
|
||||
A10000019 /* LogViewModel.swift in Sources */,
|
||||
A10000020 /* SettingsController.swift in Sources */,
|
||||
A10000021 /* Logger.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXVariantGroup section */
|
||||
A20000023 /* Localizable.strings */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
A20000024 /* de */,
|
||||
A20000025 /* en */,
|
||||
);
|
||||
name = Localizable.strings;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXVariantGroup section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
AD0000001 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
ENABLE_USER_SCRIPT_SANDBOXING = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu17;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
AD0000002 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_USER_SCRIPT_SANDBOXING = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu17;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
MTL_FAST_MATH = YES;
|
||||
SDKROOT = macosx;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
AE0000001 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_ENTITLEMENTS = "FT991A-Remote/FT991A_Remote.entitlements";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEVELOPMENT_ASSET_PATHS = "";
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = "FT991A-Remote/Info.plist";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "FT-991A Remote";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright 2024";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "FT-991A Remote needs microphone access for audio monitoring and digital modes.";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.hamradio.FT991A-Remote";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
AE0000002 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_ENTITLEMENTS = "FT991A-Remote/FT991A_Remote.entitlements";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEVELOPMENT_ASSET_PATHS = "";
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = "FT991A-Remote/Info.plist";
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "FT-991A Remote";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright 2024";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "FT-991A Remote needs microphone access for audio monitoring and digital modes.";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.hamradio.FT991A-Remote";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
A70000001 /* Build configuration list for PBXNativeTarget "FT991A-Remote" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
AE0000001 /* Debug */,
|
||||
AE0000002 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
AC0000001 /* Build configuration list for PBXProject "FT991A-Remote" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
AD0000001 /* Debug */,
|
||||
AD0000002 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
};
|
||||
rootObject = AB0000001 /* Project object */;
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"colors" : [
|
||||
{
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "0.984",
|
||||
"green" : "0.584",
|
||||
"red" : "0.000"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
},
|
||||
{
|
||||
"appearances" : [
|
||||
{
|
||||
"appearance" : "luminosity",
|
||||
"value" : "dark"
|
||||
}
|
||||
],
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "1.000",
|
||||
"green" : "0.678",
|
||||
"red" : "0.251"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "16x16"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "16x16"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "32x32"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "32x32"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "128x128"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "128x128"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "256x256"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "256x256"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "512x512"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "512x512"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<false/>
|
||||
<key>com.apple.security.device.serial</key>
|
||||
<true/>
|
||||
<key>com.apple.security.device.audio-input</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.downloads.read-write</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,109 @@
|
||||
//
|
||||
// FT991A_RemoteApp.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Yaesu FT-991A Remote Control Application for macOS
|
||||
// CAT Protocol via USB Serial (Silicon Labs CP210x)
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
@main
|
||||
struct FT991A_RemoteApp: App {
|
||||
@StateObject private var radioViewModel = RadioViewModel()
|
||||
@StateObject private var settingsController = SettingsController()
|
||||
@StateObject private var logViewModel = LogViewModel()
|
||||
|
||||
@Environment(\.scenePhase) private var scenePhase
|
||||
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
MainView()
|
||||
.environmentObject(radioViewModel)
|
||||
.environmentObject(settingsController)
|
||||
.environmentObject(logViewModel)
|
||||
.frame(minWidth: 800, minHeight: 600)
|
||||
}
|
||||
.windowStyle(.hiddenTitleBar)
|
||||
.commands {
|
||||
CommandGroup(replacing: .newItem) { }
|
||||
|
||||
CommandMenu("Radio") {
|
||||
Button(radioViewModel.isConnected ? "Trennen" : "Verbinden") {
|
||||
radioViewModel.toggleConnection()
|
||||
}
|
||||
.keyboardShortcut("k", modifiers: .command)
|
||||
|
||||
Divider()
|
||||
|
||||
Button("VFO A/B tauschen") {
|
||||
radioViewModel.swapVFO()
|
||||
}
|
||||
.keyboardShortcut("s", modifiers: [.command, .shift])
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Button("A=B") {
|
||||
radioViewModel.equalizeVFO()
|
||||
}
|
||||
.keyboardShortcut("e", modifiers: [.command, .shift])
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Divider()
|
||||
|
||||
Button("ATU Tune") {
|
||||
radioViewModel.startATUTune()
|
||||
}
|
||||
.keyboardShortcut("t", modifiers: [.command, .shift])
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
|
||||
CommandMenu("Ansicht") {
|
||||
Picker("UI-Stil", selection: $settingsController.uiStyle) {
|
||||
Text("Modern").tag(UIStyle.modern)
|
||||
Text("Frontpanel").tag(UIStyle.skeuomorph)
|
||||
}
|
||||
|
||||
Divider()
|
||||
|
||||
Toggle("Debug-Panel anzeigen", isOn: $settingsController.showDebugPanel)
|
||||
.keyboardShortcut("d", modifiers: [.command, .option])
|
||||
|
||||
Toggle("Log-Panel anzeigen", isOn: $settingsController.showLogPanel)
|
||||
.keyboardShortcut("l", modifiers: [.command, .option])
|
||||
}
|
||||
}
|
||||
|
||||
Settings {
|
||||
SettingsView()
|
||||
.environmentObject(radioViewModel)
|
||||
.environmentObject(settingsController)
|
||||
}
|
||||
|
||||
MenuBarExtra("FT-991A", systemImage: radioViewModel.isConnected ? "antenna.radiowaves.left.and.right" : "antenna.radiowaves.left.and.right.slash") {
|
||||
MenuBarView()
|
||||
.environmentObject(radioViewModel)
|
||||
.environmentObject(settingsController)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - UI Style Enum
|
||||
|
||||
enum UIStyle: String, Codable, CaseIterable {
|
||||
case modern = "Modern"
|
||||
case skeuomorph = "Frontpanel"
|
||||
}
|
||||
|
||||
// MARK: - Language Enum
|
||||
|
||||
enum AppLanguage: String, Codable, CaseIterable {
|
||||
case german = "de"
|
||||
case english = "en"
|
||||
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .german: return "Deutsch"
|
||||
case .english: return "English"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>de</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.utilities</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright 2024</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<string>csv</string>
|
||||
</array>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>QSO Log File</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>LSItemContentTypes</key>
|
||||
<array>
|
||||
<string>public.comma-separated-values-text</string>
|
||||
</array>
|
||||
</dict>
|
||||
</array>
|
||||
<key>LSUIElement</key>
|
||||
<false/>
|
||||
<key>NSAppleEventsUsageDescription</key>
|
||||
<string>FT-991A Remote needs to control other applications for audio routing.</string>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>FT-991A Remote needs microphone access for audio monitoring and digital modes.</string>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,266 @@
|
||||
//
|
||||
// CATCommand.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// CAT Command definitions for FT-991A
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// MARK: - CAT Command
|
||||
|
||||
struct CATCommand {
|
||||
let command: String
|
||||
let description: String
|
||||
let expectsResponse: Bool
|
||||
|
||||
init(_ command: String, description: String = "", expectsResponse: Bool = true) {
|
||||
self.command = command
|
||||
self.description = description
|
||||
self.expectsResponse = expectsResponse
|
||||
}
|
||||
|
||||
var data: Data {
|
||||
(command + ";").data(using: .ascii) ?? Data()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - CAT Commands Catalog
|
||||
|
||||
enum CAT {
|
||||
|
||||
// MARK: - Frequency Commands
|
||||
|
||||
/// Read VFO-A frequency
|
||||
static let readVFOA = CATCommand("FA", description: "Read VFO-A frequency")
|
||||
|
||||
/// Set VFO-A frequency (9 digits in Hz)
|
||||
static func setVFOA(_ frequency: Int) -> CATCommand {
|
||||
CATCommand(String(format: "FA%09d", frequency), description: "Set VFO-A to \(frequency) Hz", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read VFO-B frequency
|
||||
static let readVFOB = CATCommand("FB", description: "Read VFO-B frequency")
|
||||
|
||||
/// Set VFO-B frequency (9 digits in Hz)
|
||||
static func setVFOB(_ frequency: Int) -> CATCommand {
|
||||
CATCommand(String(format: "FB%09d", frequency), description: "Set VFO-B to \(frequency) Hz", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Swap VFO A/B
|
||||
static let swapVFO = CATCommand("SV", description: "Swap VFO A/B", expectsResponse: false)
|
||||
|
||||
/// Select VFO-A
|
||||
static let selectVFOA = CATCommand("VS0", description: "Select VFO-A", expectsResponse: false)
|
||||
|
||||
/// Select VFO-B
|
||||
static let selectVFOB = CATCommand("VS1", description: "Select VFO-B", expectsResponse: false)
|
||||
|
||||
/// Read active VFO
|
||||
static let readActiveVFO = CATCommand("VS", description: "Read active VFO")
|
||||
|
||||
// MARK: - Mode Commands
|
||||
|
||||
/// Read operating mode
|
||||
static let readMode = CATCommand("MD0", description: "Read operating mode")
|
||||
|
||||
/// Set operating mode
|
||||
static func setMode(_ mode: OperatingMode) -> CATCommand {
|
||||
CATCommand("MD0\(mode.catValue)", description: "Set mode to \(mode.rawValue)", expectsResponse: false)
|
||||
}
|
||||
|
||||
// MARK: - Level Commands
|
||||
|
||||
/// Read AF gain
|
||||
static let readAFGain = CATCommand("AG0", description: "Read AF gain")
|
||||
|
||||
/// Set AF gain (000-255)
|
||||
static func setAFGain(_ value: Int) -> CATCommand {
|
||||
CATCommand(String(format: "AG0%03d", min(255, max(0, value))), description: "Set AF gain", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read RF gain
|
||||
static let readRFGain = CATCommand("RG0", description: "Read RF gain")
|
||||
|
||||
/// Set RF gain (000-255)
|
||||
static func setRFGain(_ value: Int) -> CATCommand {
|
||||
CATCommand(String(format: "RG0%03d", min(255, max(0, value))), description: "Set RF gain", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read squelch
|
||||
static let readSquelch = CATCommand("SQ0", description: "Read squelch")
|
||||
|
||||
/// Set squelch (000-255)
|
||||
static func setSquelch(_ value: Int) -> CATCommand {
|
||||
CATCommand(String(format: "SQ0%03d", min(255, max(0, value))), description: "Set squelch", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read MIC gain
|
||||
static let readMICGain = CATCommand("MG", description: "Read MIC gain")
|
||||
|
||||
/// Set MIC gain (000-100)
|
||||
static func setMICGain(_ value: Int) -> CATCommand {
|
||||
CATCommand(String(format: "MG%03d", min(100, max(0, value))), description: "Set MIC gain", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read power level
|
||||
static let readPower = CATCommand("PC", description: "Read power level")
|
||||
|
||||
/// Set power level (005-100)
|
||||
static func setPower(_ value: Int) -> CATCommand {
|
||||
CATCommand(String(format: "PC%03d", min(100, max(5, value))), description: "Set power to \(value)W", expectsResponse: false)
|
||||
}
|
||||
|
||||
// MARK: - Function Commands
|
||||
|
||||
/// Read Noise Blanker status
|
||||
static let readNB = CATCommand("NB0", description: "Read NB status")
|
||||
|
||||
/// Set Noise Blanker on/off
|
||||
static func setNB(_ enabled: Bool) -> CATCommand {
|
||||
CATCommand("NB0\(enabled ? "1" : "0")", description: enabled ? "Enable NB" : "Disable NB", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read Noise Reduction status
|
||||
static let readNR = CATCommand("NR0", description: "Read NR status")
|
||||
|
||||
/// Set Noise Reduction on/off
|
||||
static func setNR(_ enabled: Bool) -> CATCommand {
|
||||
CATCommand("NR0\(enabled ? "1" : "0")", description: enabled ? "Enable NR" : "Disable NR", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read DNF status
|
||||
static let readDNF = CATCommand("BC0", description: "Read DNF status")
|
||||
|
||||
/// Set DNF on/off
|
||||
static func setDNF(_ enabled: Bool) -> CATCommand {
|
||||
CATCommand("BC0\(enabled ? "1" : "0")", description: enabled ? "Enable DNF" : "Disable DNF", expectsResponse: false)
|
||||
}
|
||||
|
||||
/// Read Contour status
|
||||
static let readContour = CATCommand("CO00", description: "Read Contour status")
|
||||
|
||||
/// Read ATU status
|
||||
static let readATU = CATCommand("AC", description: "Read ATU status")
|
||||
|
||||
/// Start ATU tune
|
||||
static let startATUTune = CATCommand("AC001", description: "Start ATU tune", expectsResponse: false)
|
||||
|
||||
/// Read Split status
|
||||
static let readSplit = CATCommand("FT", description: "Read Split status")
|
||||
|
||||
/// Set Split on/off
|
||||
static func setSplit(_ enabled: Bool) -> CATCommand {
|
||||
CATCommand("FT\(enabled ? "1" : "0")", description: enabled ? "Enable Split" : "Disable Split", expectsResponse: false)
|
||||
}
|
||||
|
||||
// MARK: - Metering Commands
|
||||
|
||||
/// Read S-Meter
|
||||
static let readSMeter = CATCommand("SM0", description: "Read S-Meter")
|
||||
|
||||
/// Read Power meter
|
||||
static let readPowerMeter = CATCommand("RM1", description: "Read Power meter")
|
||||
|
||||
/// Read SWR meter
|
||||
static let readSWRMeter = CATCommand("RM6", description: "Read SWR meter")
|
||||
|
||||
// MARK: - PTT Commands
|
||||
|
||||
/// Start transmitting (MIC)
|
||||
static let txOn = CATCommand("TX0", description: "TX on (MIC)", expectsResponse: false)
|
||||
|
||||
/// Start transmitting (DATA)
|
||||
static let txOnData = CATCommand("TX1", description: "TX on (DATA)", expectsResponse: false)
|
||||
|
||||
/// Stop transmitting
|
||||
static let txOff = CATCommand("RX", description: "TX off", expectsResponse: false)
|
||||
|
||||
/// Read TX status
|
||||
static let readTXStatus = CATCommand("TX", description: "Read TX status")
|
||||
|
||||
// MARK: - Identification
|
||||
|
||||
/// Read radio ID
|
||||
static let readID = CATCommand("ID", description: "Read radio ID")
|
||||
|
||||
// MARK: - Information
|
||||
|
||||
/// Read all status (IF command)
|
||||
static let readInfo = CATCommand("IF", description: "Read info")
|
||||
}
|
||||
|
||||
// MARK: - CAT Response
|
||||
|
||||
struct CATResponse {
|
||||
let command: String
|
||||
let value: String
|
||||
let rawData: String
|
||||
let timestamp: Date
|
||||
|
||||
init(rawData: String) {
|
||||
self.rawData = rawData.trimmingCharacters(in: CharacterSet(charactersIn: ";\r\n"))
|
||||
self.timestamp = Date()
|
||||
|
||||
// Parse command prefix (2 characters usually)
|
||||
if rawData.count >= 2 {
|
||||
let prefixEnd = rawData.index(rawData.startIndex, offsetBy: 2)
|
||||
self.command = String(rawData[..<prefixEnd])
|
||||
self.value = String(rawData[prefixEnd...]).trimmingCharacters(in: CharacterSet(charactersIn: ";\r\n"))
|
||||
} else {
|
||||
self.command = rawData
|
||||
self.value = ""
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Value Parsers
|
||||
|
||||
/// Parse frequency from FA/FB response (9 digits)
|
||||
var frequency: Int? {
|
||||
guard command == "FA" || command == "FB" else { return nil }
|
||||
return Int(value)
|
||||
}
|
||||
|
||||
/// Parse mode from MD0 response
|
||||
var mode: OperatingMode? {
|
||||
guard command == "MD" else { return nil }
|
||||
let modeChar = value.dropFirst() // Remove "0" prefix
|
||||
return OperatingMode.from(catValue: String(modeChar))
|
||||
}
|
||||
|
||||
/// Parse level value (3 digits)
|
||||
var levelValue: Int? {
|
||||
// Handle commands like AG0XXX, RG0XXX, SQ0XXX
|
||||
let numericPart = value.filter { $0.isNumber }
|
||||
return Int(numericPart)
|
||||
}
|
||||
|
||||
/// Parse S-Meter from SM0 response
|
||||
var sMeter: Int? {
|
||||
guard command == "SM" else { return nil }
|
||||
// SM0XXX format - drop the "0" prefix
|
||||
let numericPart = value.dropFirst()
|
||||
return Int(numericPart)
|
||||
}
|
||||
|
||||
/// Parse boolean status (0 or 1)
|
||||
var boolValue: Bool? {
|
||||
guard let last = value.last else { return nil }
|
||||
return last == "1"
|
||||
}
|
||||
|
||||
/// Parse VFO selection
|
||||
var vfo: VFO? {
|
||||
guard command == "VS" else { return nil }
|
||||
switch value {
|
||||
case "0": return .a
|
||||
case "1": return .b
|
||||
default: return nil
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if this is the FT-991A ID
|
||||
var isFT991A: Bool {
|
||||
command == "ID" && value == "0670"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,163 @@
|
||||
//
|
||||
// QSOEntry.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Model for QSO log entries
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// MARK: - QSO Entry
|
||||
|
||||
struct QSOEntry: Identifiable, Codable, Hashable {
|
||||
let id: UUID
|
||||
var callsign: String
|
||||
var date: Date
|
||||
var frequency: Int // Hz
|
||||
var mode: OperatingMode
|
||||
var rstSent: String // e.g., "59", "599"
|
||||
var rstReceived: String
|
||||
var name: String
|
||||
var qth: String
|
||||
var locator: String // Maidenhead grid
|
||||
var power: Int // Watts
|
||||
var notes: String
|
||||
|
||||
init(
|
||||
id: UUID = UUID(),
|
||||
callsign: String = "",
|
||||
date: Date = Date(),
|
||||
frequency: Int = 14_250_000,
|
||||
mode: OperatingMode = .usb,
|
||||
rstSent: String = "59",
|
||||
rstReceived: String = "59",
|
||||
name: String = "",
|
||||
qth: String = "",
|
||||
locator: String = "",
|
||||
power: Int = 100,
|
||||
notes: String = ""
|
||||
) {
|
||||
self.id = id
|
||||
self.callsign = callsign
|
||||
self.date = date
|
||||
self.frequency = frequency
|
||||
self.mode = mode
|
||||
self.rstSent = rstSent
|
||||
self.rstReceived = rstReceived
|
||||
self.name = name
|
||||
self.qth = qth
|
||||
self.locator = locator
|
||||
self.power = power
|
||||
self.notes = notes
|
||||
}
|
||||
|
||||
// MARK: - CSV Export
|
||||
|
||||
static let csvHeader = "Call,Date,Time,Frequency,Mode,RST_TX,RST_RX,Name,QTH,Locator,Power,Notes"
|
||||
|
||||
var csvLine: String {
|
||||
let dateFormatter = DateFormatter()
|
||||
dateFormatter.dateFormat = "yyyy-MM-dd"
|
||||
let timeFormatter = DateFormatter()
|
||||
timeFormatter.dateFormat = "HH:mm:ss"
|
||||
timeFormatter.timeZone = TimeZone(identifier: "UTC")
|
||||
|
||||
let freqMHz = String(format: "%.6f", Double(frequency) / 1_000_000.0)
|
||||
|
||||
// Escape fields with commas or quotes
|
||||
let escapedNotes = notes.contains(",") || notes.contains("\"")
|
||||
? "\"\(notes.replacingOccurrences(of: "\"", with: "\"\""))\""
|
||||
: notes
|
||||
|
||||
let escapedName = name.contains(",") || name.contains("\"")
|
||||
? "\"\(name.replacingOccurrences(of: "\"", with: "\"\""))\""
|
||||
: name
|
||||
|
||||
return [
|
||||
callsign,
|
||||
dateFormatter.string(from: date),
|
||||
timeFormatter.string(from: date),
|
||||
freqMHz,
|
||||
mode.rawValue,
|
||||
rstSent,
|
||||
rstReceived,
|
||||
escapedName,
|
||||
qth,
|
||||
locator,
|
||||
String(power),
|
||||
escapedNotes
|
||||
].joined(separator: ",")
|
||||
}
|
||||
|
||||
// MARK: - CSV Import
|
||||
|
||||
static func from(csvLine: String) -> QSOEntry? {
|
||||
var fields: [String] = []
|
||||
var current = ""
|
||||
var inQuotes = false
|
||||
|
||||
for char in csvLine {
|
||||
if char == "\"" {
|
||||
inQuotes.toggle()
|
||||
} else if char == "," && !inQuotes {
|
||||
fields.append(current)
|
||||
current = ""
|
||||
} else {
|
||||
current.append(char)
|
||||
}
|
||||
}
|
||||
fields.append(current)
|
||||
|
||||
guard fields.count >= 12 else { return nil }
|
||||
|
||||
let dateFormatter = DateFormatter()
|
||||
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
|
||||
dateFormatter.timeZone = TimeZone(identifier: "UTC")
|
||||
|
||||
guard let date = dateFormatter.date(from: "\(fields[1]) \(fields[2])") else { return nil }
|
||||
guard let freqMHz = Double(fields[3]) else { return nil }
|
||||
|
||||
let frequency = Int(freqMHz * 1_000_000)
|
||||
let mode = OperatingMode.allCases.first { $0.rawValue == fields[4] } ?? .usb
|
||||
|
||||
return QSOEntry(
|
||||
callsign: fields[0],
|
||||
date: date,
|
||||
frequency: frequency,
|
||||
mode: mode,
|
||||
rstSent: fields[5],
|
||||
rstReceived: fields[6],
|
||||
name: fields[7],
|
||||
qth: fields[8],
|
||||
locator: fields[9],
|
||||
power: Int(fields[10]) ?? 100,
|
||||
notes: fields[11]
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Display Helpers
|
||||
|
||||
var frequencyDisplay: String {
|
||||
let mhz = frequency / 1_000_000
|
||||
let khz = (frequency % 1_000_000) / 1_000
|
||||
let hz = frequency % 1_000
|
||||
return String(format: "%d.%03d.%03d", mhz, khz, hz)
|
||||
}
|
||||
|
||||
var dateDisplay: String {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateFormat = "dd.MM.yyyy"
|
||||
return formatter.string(from: date)
|
||||
}
|
||||
|
||||
var timeDisplay: String {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateFormat = "HH:mm"
|
||||
formatter.timeZone = TimeZone(identifier: "UTC")
|
||||
return formatter.string(from: date) + " UTC"
|
||||
}
|
||||
|
||||
var bandDisplay: String {
|
||||
Band.from(frequency: frequency)?.rawValue ?? "?"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,238 @@
|
||||
//
|
||||
// RadioState.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Model representing the current state of the FT-991A transceiver
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// MARK: - Radio State
|
||||
|
||||
struct RadioState {
|
||||
// VFO Frequencies
|
||||
var vfoAFrequency: Int = 14_250_000 // Hz
|
||||
var vfoBFrequency: Int = 14_255_000 // Hz
|
||||
var activeVFO: VFO = .a
|
||||
|
||||
// Operating Mode
|
||||
var mode: OperatingMode = .usb
|
||||
var filterWidth: Int = 3000 // Hz
|
||||
var filterShift: Int = 0 // Hz
|
||||
|
||||
// Levels (0-255)
|
||||
var afGain: Int = 128
|
||||
var rfGain: Int = 255
|
||||
var squelch: Int = 0
|
||||
var micGain: Int = 50
|
||||
var power: Int = 100 // Watts (5-100)
|
||||
|
||||
// Functions
|
||||
var noiseBlanker: Bool = false
|
||||
var noiseReduction: Bool = false
|
||||
var dnf: Bool = false
|
||||
var contour: Bool = false
|
||||
var atu: Bool = false
|
||||
var split: Bool = false
|
||||
var ipo: Bool = false
|
||||
|
||||
// Metering
|
||||
var sMeter: Int = 0 // 0-255
|
||||
var powerMeter: Int = 0 // 0-255
|
||||
var swrMeter: Int = 0 // 0-255
|
||||
|
||||
// TX State
|
||||
var isTransmitting: Bool = false
|
||||
|
||||
// Computed Properties
|
||||
|
||||
var activeFrequency: Int {
|
||||
activeVFO == .a ? vfoAFrequency : vfoBFrequency
|
||||
}
|
||||
|
||||
var sMeterDB: Double {
|
||||
// S0-S9 = 0-54 dBμV, each S-unit = 6 dB
|
||||
// Above S9: +10, +20, +40, +60 dB
|
||||
let normalized = Double(sMeter) / 255.0
|
||||
if normalized <= 0.6 {
|
||||
return normalized / 0.6 * 54.0 // S0-S9
|
||||
} else {
|
||||
return 54.0 + (normalized - 0.6) / 0.4 * 60.0 // S9+60
|
||||
}
|
||||
}
|
||||
|
||||
var sMeterString: String {
|
||||
let normalized = Double(sMeter) / 255.0
|
||||
if normalized <= 0.6 {
|
||||
let sUnit = Int(normalized / 0.6 * 9.0)
|
||||
return "S\(sUnit)"
|
||||
} else {
|
||||
let db = Int((normalized - 0.6) / 0.4 * 60.0)
|
||||
return "S9+\(db)"
|
||||
}
|
||||
}
|
||||
|
||||
var frequencyDisplay: String {
|
||||
formatFrequency(activeFrequency)
|
||||
}
|
||||
|
||||
func formatFrequency(_ freq: Int) -> String {
|
||||
let mhz = freq / 1_000_000
|
||||
let khz = (freq % 1_000_000) / 1_000
|
||||
let hz = freq % 1_000
|
||||
return String(format: "%d.%03d.%03d", mhz, khz, hz)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - VFO
|
||||
|
||||
enum VFO: String, Codable {
|
||||
case a = "A"
|
||||
case b = "B"
|
||||
}
|
||||
|
||||
// MARK: - Operating Mode
|
||||
|
||||
enum OperatingMode: String, CaseIterable, Codable {
|
||||
case lsb = "LSB"
|
||||
case usb = "USB"
|
||||
case cw = "CW"
|
||||
case fm = "FM"
|
||||
case am = "AM"
|
||||
case rttyLSB = "RTTY-L"
|
||||
case cwReverse = "CW-R"
|
||||
case dataLSB = "DATA-L"
|
||||
case rttyUSB = "RTTY-U"
|
||||
case dataFM = "DATA-FM"
|
||||
case fmNarrow = "FM-N"
|
||||
case dataUSB = "DATA-U"
|
||||
case amNarrow = "AM-N"
|
||||
case c4fm = "C4FM"
|
||||
|
||||
// CAT command value (MD0X)
|
||||
var catValue: String {
|
||||
switch self {
|
||||
case .lsb: return "1"
|
||||
case .usb: return "2"
|
||||
case .cw: return "3"
|
||||
case .fm: return "4"
|
||||
case .am: return "5"
|
||||
case .rttyLSB: return "6"
|
||||
case .cwReverse: return "7"
|
||||
case .dataLSB: return "8"
|
||||
case .rttyUSB: return "9"
|
||||
case .dataFM: return "A"
|
||||
case .fmNarrow: return "B"
|
||||
case .dataUSB: return "C"
|
||||
case .amNarrow: return "D"
|
||||
case .c4fm: return "E"
|
||||
}
|
||||
}
|
||||
|
||||
static func from(catValue: String) -> OperatingMode? {
|
||||
allCases.first { $0.catValue == catValue }
|
||||
}
|
||||
|
||||
var isDigital: Bool {
|
||||
switch self {
|
||||
case .dataLSB, .dataUSB, .dataFM, .rttyLSB, .rttyUSB, .c4fm:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
var defaultFilterWidth: Int {
|
||||
switch self {
|
||||
case .lsb, .usb, .dataLSB, .dataUSB: return 3000
|
||||
case .cw, .cwReverse: return 500
|
||||
case .am, .amNarrow: return 6000
|
||||
case .fm, .fmNarrow, .dataFM, .c4fm: return 15000
|
||||
case .rttyLSB, .rttyUSB: return 500
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Frequency Step
|
||||
|
||||
enum FrequencyStep: Int, CaseIterable, Codable {
|
||||
case hz1 = 1
|
||||
case hz10 = 10
|
||||
case hz100 = 100
|
||||
case khz1 = 1000
|
||||
case khz5 = 5000
|
||||
case khz10 = 10000
|
||||
case khz100 = 100000
|
||||
case mhz1 = 1000000
|
||||
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .hz1: return "1 Hz"
|
||||
case .hz10: return "10 Hz"
|
||||
case .hz100: return "100 Hz"
|
||||
case .khz1: return "1 kHz"
|
||||
case .khz5: return "5 kHz"
|
||||
case .khz10: return "10 kHz"
|
||||
case .khz100: return "100 kHz"
|
||||
case .mhz1: return "1 MHz"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Band
|
||||
|
||||
enum Band: String, CaseIterable {
|
||||
case m160 = "160m"
|
||||
case m80 = "80m"
|
||||
case m60 = "60m"
|
||||
case m40 = "40m"
|
||||
case m30 = "30m"
|
||||
case m20 = "20m"
|
||||
case m17 = "17m"
|
||||
case m15 = "15m"
|
||||
case m12 = "12m"
|
||||
case m10 = "10m"
|
||||
case m6 = "6m"
|
||||
case m2 = "2m"
|
||||
case cm70 = "70cm"
|
||||
|
||||
var frequencyRange: ClosedRange<Int> {
|
||||
switch self {
|
||||
case .m160: return 1_800_000...2_000_000
|
||||
case .m80: return 3_500_000...4_000_000
|
||||
case .m60: return 5_351_500...5_366_500
|
||||
case .m40: return 7_000_000...7_300_000
|
||||
case .m30: return 10_100_000...10_150_000
|
||||
case .m20: return 14_000_000...14_350_000
|
||||
case .m17: return 18_068_000...18_168_000
|
||||
case .m15: return 21_000_000...21_450_000
|
||||
case .m12: return 24_890_000...24_990_000
|
||||
case .m10: return 28_000_000...29_700_000
|
||||
case .m6: return 50_000_000...54_000_000
|
||||
case .m2: return 144_000_000...148_000_000
|
||||
case .cm70: return 430_000_000...450_000_000
|
||||
}
|
||||
}
|
||||
|
||||
var defaultFrequency: Int {
|
||||
switch self {
|
||||
case .m160: return 1_840_000
|
||||
case .m80: return 3_700_000
|
||||
case .m60: return 5_357_000
|
||||
case .m40: return 7_100_000
|
||||
case .m30: return 10_120_000
|
||||
case .m20: return 14_250_000
|
||||
case .m17: return 18_110_000
|
||||
case .m15: return 21_250_000
|
||||
case .m12: return 24_930_000
|
||||
case .m10: return 28_500_000
|
||||
case .m6: return 50_150_000
|
||||
case .m2: return 145_500_000
|
||||
case .cm70: return 433_500_000
|
||||
}
|
||||
}
|
||||
|
||||
static func from(frequency: Int) -> Band? {
|
||||
allCases.first { $0.frequencyRange.contains(frequency) }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,123 @@
|
||||
//
|
||||
// Settings.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Application settings model
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// MARK: - App Settings
|
||||
|
||||
struct AppSettings: Codable {
|
||||
// Connection
|
||||
var serialPort: String = ""
|
||||
var baudRate: Int = 38400
|
||||
var autoReconnect: Bool = true
|
||||
var reconnectInterval: TimeInterval = 5.0
|
||||
|
||||
// UI
|
||||
var uiStyle: UIStyle = .modern
|
||||
var language: AppLanguage = .german
|
||||
var showDebugPanel: Bool = false
|
||||
var showLogPanel: Bool = false
|
||||
var compactMode: Bool = true
|
||||
|
||||
// Frequency
|
||||
var frequencyStep: FrequencyStep = .khz1
|
||||
|
||||
// Logging
|
||||
var logDirectory: String = "~/Documents/FT991A-Logs/"
|
||||
var autoSaveLog: Bool = true
|
||||
|
||||
// Audio
|
||||
var audioInputDevice: String = ""
|
||||
var audioOutputDevice: String = ""
|
||||
var useBlackHole: Bool = false
|
||||
|
||||
// Keyboard
|
||||
var pttShortcutEnabled: Bool = true
|
||||
var arrowFrequencyEnabled: Bool = true
|
||||
var tunerShortcutEnabled: Bool = true
|
||||
|
||||
// MARK: - Persistence
|
||||
|
||||
static let defaults = AppSettings()
|
||||
|
||||
static var settingsURL: URL {
|
||||
let appSupport = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
|
||||
let appFolder = appSupport.appendingPathComponent("FT991A-Remote", isDirectory: true)
|
||||
|
||||
try? FileManager.default.createDirectory(at: appFolder, withIntermediateDirectories: true)
|
||||
|
||||
return appFolder.appendingPathComponent("settings.json")
|
||||
}
|
||||
|
||||
static func load() -> AppSettings {
|
||||
guard FileManager.default.fileExists(atPath: settingsURL.path) else {
|
||||
return defaults
|
||||
}
|
||||
|
||||
do {
|
||||
let data = try Data(contentsOf: settingsURL)
|
||||
return try JSONDecoder().decode(AppSettings.self, from: data)
|
||||
} catch {
|
||||
print("Failed to load settings: \(error)")
|
||||
return defaults
|
||||
}
|
||||
}
|
||||
|
||||
func save() {
|
||||
do {
|
||||
let data = try JSONEncoder().encode(self)
|
||||
try data.write(to: AppSettings.settingsURL)
|
||||
} catch {
|
||||
print("Failed to save settings: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Log Directory
|
||||
|
||||
var expandedLogDirectory: String {
|
||||
(logDirectory as NSString).expandingTildeInPath
|
||||
}
|
||||
|
||||
mutating func ensureLogDirectoryExists() {
|
||||
let path = expandedLogDirectory
|
||||
if !FileManager.default.fileExists(atPath: path) {
|
||||
try? FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Serial Port Configuration
|
||||
|
||||
struct SerialConfig: Codable {
|
||||
var baudRate: Int = 38400
|
||||
var dataBits: Int = 8
|
||||
var stopBits: Int = 1
|
||||
var parity: Parity = .none
|
||||
var flowControl: FlowControl = .none
|
||||
|
||||
enum Parity: String, Codable, CaseIterable {
|
||||
case none = "None"
|
||||
case odd = "Odd"
|
||||
case even = "Even"
|
||||
}
|
||||
|
||||
enum FlowControl: String, Codable, CaseIterable {
|
||||
case none = "None"
|
||||
case hardware = "RTS/CTS"
|
||||
case software = "XON/XOFF"
|
||||
}
|
||||
|
||||
static let ft991aDefault = SerialConfig(
|
||||
baudRate: 38400,
|
||||
dataBits: 8,
|
||||
stopBits: 1,
|
||||
parity: .none,
|
||||
flowControl: .none
|
||||
)
|
||||
|
||||
static let availableBaudRates = [4800, 9600, 19200, 38400, 57600, 115200]
|
||||
}
|
||||
@@ -0,0 +1,250 @@
|
||||
//
|
||||
// AudioRouter.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// BlackHole audio routing integration for digital modes
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import AVFoundation
|
||||
|
||||
// MARK: - Audio Device
|
||||
|
||||
struct AudioDevice: Identifiable, Hashable {
|
||||
let id: AudioDeviceID
|
||||
let name: String
|
||||
let uid: String
|
||||
let isInput: Bool
|
||||
let isOutput: Bool
|
||||
let isBlackHole: Bool
|
||||
|
||||
var displayName: String {
|
||||
if isBlackHole {
|
||||
return "\(name) (Virtual)"
|
||||
}
|
||||
return name
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Audio Router
|
||||
|
||||
class AudioRouter: ObservableObject {
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published var inputDevices: [AudioDevice] = []
|
||||
@Published var outputDevices: [AudioDevice] = []
|
||||
|
||||
@Published var selectedInputDevice: AudioDeviceID?
|
||||
@Published var selectedOutputDevice: AudioDeviceID?
|
||||
|
||||
@Published var blackHoleDevice: AudioDevice?
|
||||
@Published var ft991aDevice: AudioDevice?
|
||||
|
||||
@Published var isBlackHoleInstalled = false
|
||||
@Published var lastError: String?
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
refreshDevices()
|
||||
}
|
||||
|
||||
// MARK: - Device Discovery
|
||||
|
||||
func refreshDevices() {
|
||||
inputDevices = []
|
||||
outputDevices = []
|
||||
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioHardwarePropertyDevices,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
var dataSize: UInt32 = 0
|
||||
var status = AudioObjectGetPropertyDataSize(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
0, nil,
|
||||
&dataSize
|
||||
)
|
||||
|
||||
guard status == noErr else {
|
||||
lastError = "Fehler beim Abrufen der Audio-Geräte"
|
||||
return
|
||||
}
|
||||
|
||||
let deviceCount = Int(dataSize) / MemoryLayout<AudioDeviceID>.size
|
||||
var deviceIDs = [AudioDeviceID](repeating: 0, count: deviceCount)
|
||||
|
||||
status = AudioObjectGetPropertyData(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
0, nil,
|
||||
&dataSize,
|
||||
&deviceIDs
|
||||
)
|
||||
|
||||
guard status == noErr else {
|
||||
lastError = "Fehler beim Laden der Audio-Geräte"
|
||||
return
|
||||
}
|
||||
|
||||
for deviceID in deviceIDs {
|
||||
if let device = createAudioDevice(from: deviceID) {
|
||||
if device.isInput {
|
||||
inputDevices.append(device)
|
||||
}
|
||||
if device.isOutput {
|
||||
outputDevices.append(device)
|
||||
}
|
||||
|
||||
// Detect BlackHole
|
||||
if device.isBlackHole && blackHoleDevice == nil {
|
||||
blackHoleDevice = device
|
||||
isBlackHoleInstalled = true
|
||||
}
|
||||
|
||||
// Detect FT-991A (usually shows as "USB Audio CODEC")
|
||||
if device.name.contains("USB Audio") || device.name.contains("FT-991") {
|
||||
ft991aDevice = device
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Logger.shared.log("Found \(inputDevices.count) input and \(outputDevices.count) output devices", level: .debug)
|
||||
|
||||
if isBlackHoleInstalled {
|
||||
Logger.shared.log("BlackHole detected: \(blackHoleDevice?.name ?? "Unknown")", level: .info)
|
||||
}
|
||||
}
|
||||
|
||||
private func createAudioDevice(from deviceID: AudioDeviceID) -> AudioDevice? {
|
||||
// Get device name
|
||||
var name: CFString = "" as CFString
|
||||
var nameSize = UInt32(MemoryLayout<CFString>.size)
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioDevicePropertyDeviceNameCFString,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
var status = AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, nil, &nameSize, &name)
|
||||
guard status == noErr else { return nil }
|
||||
|
||||
// Get device UID
|
||||
var uid: CFString = "" as CFString
|
||||
var uidSize = UInt32(MemoryLayout<CFString>.size)
|
||||
propertyAddress.mSelector = kAudioDevicePropertyDeviceUID
|
||||
|
||||
status = AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, nil, &uidSize, &uid)
|
||||
let deviceUID = status == noErr ? uid as String : ""
|
||||
|
||||
// Check for input channels
|
||||
var inputSize: UInt32 = 0
|
||||
propertyAddress.mSelector = kAudioDevicePropertyStreamConfiguration
|
||||
propertyAddress.mScope = kAudioDevicePropertyScopeInput
|
||||
|
||||
_ = AudioObjectGetPropertyDataSize(deviceID, &propertyAddress, 0, nil, &inputSize)
|
||||
let hasInput = inputSize > 0
|
||||
|
||||
// Check for output channels
|
||||
var outputSize: UInt32 = 0
|
||||
propertyAddress.mScope = kAudioDevicePropertyScopeOutput
|
||||
|
||||
_ = AudioObjectGetPropertyDataSize(deviceID, &propertyAddress, 0, nil, &outputSize)
|
||||
let hasOutput = outputSize > 0
|
||||
|
||||
let deviceName = name as String
|
||||
let isBlackHole = deviceName.lowercased().contains("blackhole")
|
||||
|
||||
return AudioDevice(
|
||||
id: deviceID,
|
||||
name: deviceName,
|
||||
uid: deviceUID,
|
||||
isInput: hasInput,
|
||||
isOutput: hasOutput,
|
||||
isBlackHole: isBlackHole
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Device Selection
|
||||
|
||||
func selectInputDevice(_ device: AudioDevice) {
|
||||
selectedInputDevice = device.id
|
||||
Logger.shared.log("Selected input device: \(device.name)", level: .info)
|
||||
}
|
||||
|
||||
func selectOutputDevice(_ device: AudioDevice) {
|
||||
selectedOutputDevice = device.id
|
||||
Logger.shared.log("Selected output device: \(device.name)", level: .info)
|
||||
}
|
||||
|
||||
// MARK: - BlackHole Setup
|
||||
|
||||
func configureForDigitalModes() -> Bool {
|
||||
guard isBlackHoleInstalled, let blackHole = blackHoleDevice else {
|
||||
lastError = "BlackHole ist nicht installiert"
|
||||
return false
|
||||
}
|
||||
|
||||
// Route: FT-991A USB Audio → BlackHole → Digital Mode App
|
||||
// Route back: Digital Mode App → BlackHole → FT-991A USB Audio
|
||||
|
||||
if let ft991a = ft991aDevice {
|
||||
selectedInputDevice = ft991a.id // FT-991A as input (RX audio)
|
||||
selectedOutputDevice = blackHole.id // BlackHole as output (to digital mode app)
|
||||
|
||||
Logger.shared.log("Configured for digital modes: \(ft991a.name) → \(blackHole.name)", level: .info)
|
||||
return true
|
||||
} else {
|
||||
lastError = "FT-991A Audio-Gerät nicht gefunden"
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - System Audio
|
||||
|
||||
func setSystemDefaultInput(_ deviceID: AudioDeviceID) {
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioHardwarePropertyDefaultInputDevice,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
var deviceIDVar = deviceID
|
||||
let status = AudioObjectSetPropertyData(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
0, nil,
|
||||
UInt32(MemoryLayout<AudioDeviceID>.size),
|
||||
&deviceIDVar
|
||||
)
|
||||
|
||||
if status != noErr {
|
||||
lastError = "Fehler beim Setzen des Standard-Eingangs"
|
||||
}
|
||||
}
|
||||
|
||||
func setSystemDefaultOutput(_ deviceID: AudioDeviceID) {
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioHardwarePropertyDefaultOutputDevice,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
var deviceIDVar = deviceID
|
||||
let status = AudioObjectSetPropertyData(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
0, nil,
|
||||
UInt32(MemoryLayout<AudioDeviceID>.size),
|
||||
&deviceIDVar
|
||||
)
|
||||
|
||||
if status != noErr {
|
||||
lastError = "Fehler beim Setzen des Standard-Ausgangs"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,442 @@
|
||||
//
|
||||
// CATProtocol.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// CAT Protocol handler for FT-991A communication
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
|
||||
// MARK: - CAT Protocol
|
||||
|
||||
class CATProtocol: ObservableObject {
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published var radioState = RadioState()
|
||||
@Published var isPolling = false
|
||||
@Published var lastCommandTime: Date?
|
||||
@Published var pendingCommands: Int = 0
|
||||
|
||||
// Debug console
|
||||
@Published var commandHistory: [CommandLogEntry] = []
|
||||
|
||||
// MARK: - Private Properties
|
||||
|
||||
private let serialManager: SerialPortManager
|
||||
private var responseQueue: [CATResponse] = []
|
||||
private var pollingTimer: Timer?
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
||||
private let commandQueue = DispatchQueue(label: "cat.command", qos: .userInitiated)
|
||||
private var commandSemaphore = DispatchSemaphore(value: 1)
|
||||
|
||||
// Polling intervals
|
||||
private let fastPollInterval: TimeInterval = 0.1 // 100ms for meters
|
||||
private let slowPollInterval: TimeInterval = 0.5 // 500ms for frequency/mode
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init(serialManager: SerialPortManager) {
|
||||
self.serialManager = serialManager
|
||||
|
||||
serialManager.onDataReceived = { [weak self] data in
|
||||
self?.handleReceivedData(data)
|
||||
}
|
||||
|
||||
serialManager.onConnectionChanged = { [weak self] connected in
|
||||
if connected {
|
||||
self?.startPolling()
|
||||
self?.requestInitialState()
|
||||
} else {
|
||||
self?.stopPolling()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Command Sending
|
||||
|
||||
func send(_ command: CATCommand) {
|
||||
serialManager.send(command)
|
||||
lastCommandTime = Date()
|
||||
|
||||
// Log command
|
||||
let entry = CommandLogEntry(
|
||||
timestamp: Date(),
|
||||
direction: .sent,
|
||||
command: command.command,
|
||||
description: command.description
|
||||
)
|
||||
DispatchQueue.main.async {
|
||||
self.commandHistory.append(entry)
|
||||
if self.commandHistory.count > 500 {
|
||||
self.commandHistory.removeFirst(100)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func sendRaw(_ command: String) {
|
||||
let catCommand = CATCommand(command, description: "Manual: \(command)")
|
||||
send(catCommand)
|
||||
}
|
||||
|
||||
// MARK: - Response Handling
|
||||
|
||||
private func handleReceivedData(_ data: Data) {
|
||||
guard let responseString = String(data: data, encoding: .ascii) else { return }
|
||||
|
||||
let response = CATResponse(rawData: responseString)
|
||||
|
||||
// Log response
|
||||
let entry = CommandLogEntry(
|
||||
timestamp: Date(),
|
||||
direction: .received,
|
||||
command: response.rawData,
|
||||
description: parseResponseDescription(response)
|
||||
)
|
||||
DispatchQueue.main.async {
|
||||
self.commandHistory.append(entry)
|
||||
}
|
||||
|
||||
// Update radio state
|
||||
updateState(from: response)
|
||||
}
|
||||
|
||||
private func updateState(from response: CATResponse) {
|
||||
DispatchQueue.main.async {
|
||||
switch response.command {
|
||||
case "FA":
|
||||
if let freq = response.frequency {
|
||||
self.radioState.vfoAFrequency = freq
|
||||
}
|
||||
case "FB":
|
||||
if let freq = response.frequency {
|
||||
self.radioState.vfoBFrequency = freq
|
||||
}
|
||||
case "VS":
|
||||
if let vfo = response.vfo {
|
||||
self.radioState.activeVFO = vfo
|
||||
}
|
||||
case "MD":
|
||||
if let mode = response.mode {
|
||||
self.radioState.mode = mode
|
||||
}
|
||||
case "AG":
|
||||
if let level = response.levelValue {
|
||||
self.radioState.afGain = level
|
||||
}
|
||||
case "RG":
|
||||
if let level = response.levelValue {
|
||||
self.radioState.rfGain = level
|
||||
}
|
||||
case "SQ":
|
||||
if let level = response.levelValue {
|
||||
self.radioState.squelch = level
|
||||
}
|
||||
case "MG":
|
||||
if let level = response.levelValue {
|
||||
self.radioState.micGain = level
|
||||
}
|
||||
case "PC":
|
||||
if let power = response.levelValue {
|
||||
self.radioState.power = power
|
||||
}
|
||||
case "SM":
|
||||
if let meter = response.sMeter {
|
||||
self.radioState.sMeter = meter
|
||||
}
|
||||
case "RM":
|
||||
// RM1 = power, RM6 = SWR
|
||||
if let level = response.levelValue {
|
||||
if response.value.hasPrefix("1") {
|
||||
self.radioState.powerMeter = level
|
||||
} else if response.value.hasPrefix("6") {
|
||||
self.radioState.swrMeter = level
|
||||
}
|
||||
}
|
||||
case "NB":
|
||||
if let enabled = response.boolValue {
|
||||
self.radioState.noiseBlanker = enabled
|
||||
}
|
||||
case "NR":
|
||||
if let enabled = response.boolValue {
|
||||
self.radioState.noiseReduction = enabled
|
||||
}
|
||||
case "BC":
|
||||
if let enabled = response.boolValue {
|
||||
self.radioState.dnf = enabled
|
||||
}
|
||||
case "FT":
|
||||
if let enabled = response.boolValue {
|
||||
self.radioState.split = enabled
|
||||
}
|
||||
case "TX":
|
||||
if response.value == "0" {
|
||||
self.radioState.isTransmitting = false
|
||||
} else if response.value == "1" || response.value == "2" {
|
||||
self.radioState.isTransmitting = true
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func parseResponseDescription(_ response: CATResponse) -> String {
|
||||
switch response.command {
|
||||
case "FA":
|
||||
if let freq = response.frequency {
|
||||
return "VFO-A: \(radioState.formatFrequency(freq)) Hz"
|
||||
}
|
||||
case "FB":
|
||||
if let freq = response.frequency {
|
||||
return "VFO-B: \(radioState.formatFrequency(freq)) Hz"
|
||||
}
|
||||
case "MD":
|
||||
if let mode = response.mode {
|
||||
return "Mode: \(mode.rawValue)"
|
||||
}
|
||||
case "SM":
|
||||
if let meter = response.sMeter {
|
||||
return "S-Meter: \(meter)"
|
||||
}
|
||||
case "ID":
|
||||
if response.isFT991A {
|
||||
return "FT-991A identified"
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
return response.value
|
||||
}
|
||||
|
||||
// MARK: - Polling
|
||||
|
||||
func startPolling() {
|
||||
guard !isPolling else { return }
|
||||
isPolling = true
|
||||
|
||||
// Fast polling for meters
|
||||
pollingTimer = Timer.scheduledTimer(withTimeInterval: fastPollInterval, repeats: true) { [weak self] _ in
|
||||
self?.pollMeters()
|
||||
}
|
||||
|
||||
// Start slow polling for frequency/mode
|
||||
Timer.scheduledTimer(withTimeInterval: slowPollInterval, repeats: true) { [weak self] _ in
|
||||
self?.pollStatus()
|
||||
}
|
||||
}
|
||||
|
||||
func stopPolling() {
|
||||
pollingTimer?.invalidate()
|
||||
pollingTimer = nil
|
||||
isPolling = false
|
||||
}
|
||||
|
||||
private func pollMeters() {
|
||||
send(CAT.readSMeter)
|
||||
if radioState.isTransmitting {
|
||||
send(CAT.readPowerMeter)
|
||||
send(CAT.readSWRMeter)
|
||||
}
|
||||
}
|
||||
|
||||
private func pollStatus() {
|
||||
send(CAT.readVFOA)
|
||||
send(CAT.readVFOB)
|
||||
send(CAT.readActiveVFO)
|
||||
send(CAT.readMode)
|
||||
}
|
||||
|
||||
// MARK: - Initial State
|
||||
|
||||
private func requestInitialState() {
|
||||
// Verify radio identity
|
||||
send(CAT.readID)
|
||||
|
||||
// Request all current values
|
||||
send(CAT.readVFOA)
|
||||
send(CAT.readVFOB)
|
||||
send(CAT.readActiveVFO)
|
||||
send(CAT.readMode)
|
||||
send(CAT.readAFGain)
|
||||
send(CAT.readRFGain)
|
||||
send(CAT.readSquelch)
|
||||
send(CAT.readMICGain)
|
||||
send(CAT.readPower)
|
||||
send(CAT.readNB)
|
||||
send(CAT.readNR)
|
||||
send(CAT.readDNF)
|
||||
send(CAT.readSplit)
|
||||
send(CAT.readSMeter)
|
||||
}
|
||||
|
||||
// MARK: - Radio Control
|
||||
|
||||
func setFrequency(_ frequency: Int, vfo: VFO = .a) {
|
||||
if vfo == .a {
|
||||
send(CAT.setVFOA(frequency))
|
||||
radioState.vfoAFrequency = frequency
|
||||
} else {
|
||||
send(CAT.setVFOB(frequency))
|
||||
radioState.vfoBFrequency = frequency
|
||||
}
|
||||
}
|
||||
|
||||
func changeFrequency(by step: Int) {
|
||||
let newFreq = radioState.activeFrequency + step
|
||||
setFrequency(newFreq, vfo: radioState.activeVFO)
|
||||
}
|
||||
|
||||
func setMode(_ mode: OperatingMode) {
|
||||
send(CAT.setMode(mode))
|
||||
radioState.mode = mode
|
||||
}
|
||||
|
||||
func setAFGain(_ value: Int) {
|
||||
send(CAT.setAFGain(value))
|
||||
radioState.afGain = value
|
||||
}
|
||||
|
||||
func setRFGain(_ value: Int) {
|
||||
send(CAT.setRFGain(value))
|
||||
radioState.rfGain = value
|
||||
}
|
||||
|
||||
func setSquelch(_ value: Int) {
|
||||
send(CAT.setSquelch(value))
|
||||
radioState.squelch = value
|
||||
}
|
||||
|
||||
func setMICGain(_ value: Int) {
|
||||
send(CAT.setMICGain(value))
|
||||
radioState.micGain = value
|
||||
}
|
||||
|
||||
func setPower(_ value: Int) {
|
||||
send(CAT.setPower(value))
|
||||
radioState.power = value
|
||||
}
|
||||
|
||||
func toggleNB() {
|
||||
let newValue = !radioState.noiseBlanker
|
||||
send(CAT.setNB(newValue))
|
||||
radioState.noiseBlanker = newValue
|
||||
}
|
||||
|
||||
func toggleNR() {
|
||||
let newValue = !radioState.noiseReduction
|
||||
send(CAT.setNR(newValue))
|
||||
radioState.noiseReduction = newValue
|
||||
}
|
||||
|
||||
func toggleDNF() {
|
||||
let newValue = !radioState.dnf
|
||||
send(CAT.setDNF(newValue))
|
||||
radioState.dnf = newValue
|
||||
}
|
||||
|
||||
func toggleSplit() {
|
||||
let newValue = !radioState.split
|
||||
send(CAT.setSplit(newValue))
|
||||
radioState.split = newValue
|
||||
}
|
||||
|
||||
func selectVFO(_ vfo: VFO) {
|
||||
if vfo == .a {
|
||||
send(CAT.selectVFOA)
|
||||
} else {
|
||||
send(CAT.selectVFOB)
|
||||
}
|
||||
radioState.activeVFO = vfo
|
||||
}
|
||||
|
||||
func swapVFO() {
|
||||
send(CAT.swapVFO)
|
||||
let temp = radioState.vfoAFrequency
|
||||
radioState.vfoAFrequency = radioState.vfoBFrequency
|
||||
radioState.vfoBFrequency = temp
|
||||
}
|
||||
|
||||
func equalizeVFO() {
|
||||
// Set VFO-B to VFO-A frequency
|
||||
send(CAT.setVFOB(radioState.vfoAFrequency))
|
||||
radioState.vfoBFrequency = radioState.vfoAFrequency
|
||||
}
|
||||
|
||||
func startATUTune() {
|
||||
send(CAT.startATUTune)
|
||||
}
|
||||
|
||||
// MARK: - PTT Control
|
||||
|
||||
func startTransmit(dataMode: Bool = false) {
|
||||
if dataMode {
|
||||
send(CAT.txOnData)
|
||||
} else {
|
||||
send(CAT.txOn)
|
||||
}
|
||||
radioState.isTransmitting = true
|
||||
}
|
||||
|
||||
func stopTransmit() {
|
||||
send(CAT.txOff)
|
||||
radioState.isTransmitting = false
|
||||
}
|
||||
|
||||
func toggleTransmit(dataMode: Bool = false) {
|
||||
if radioState.isTransmitting {
|
||||
stopTransmit()
|
||||
} else {
|
||||
startTransmit(dataMode: dataMode)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Band Selection
|
||||
|
||||
func selectBand(_ band: Band) {
|
||||
setFrequency(band.defaultFrequency, vfo: radioState.activeVFO)
|
||||
}
|
||||
|
||||
// MARK: - Debug
|
||||
|
||||
func clearCommandHistory() {
|
||||
commandHistory.removeAll()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Command Log Entry
|
||||
|
||||
struct CommandLogEntry: Identifiable {
|
||||
let id = UUID()
|
||||
let timestamp: Date
|
||||
let direction: Direction
|
||||
let command: String
|
||||
let description: String
|
||||
|
||||
enum Direction {
|
||||
case sent
|
||||
case received
|
||||
|
||||
var symbol: String {
|
||||
switch self {
|
||||
case .sent: return "→"
|
||||
case .received: return "←"
|
||||
}
|
||||
}
|
||||
|
||||
var color: String {
|
||||
switch self {
|
||||
case .sent: return "blue"
|
||||
case .received: return "green"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var timeString: String {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateFormat = "HH:mm:ss.SSS"
|
||||
return formatter.string(from: timestamp)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,240 @@
|
||||
//
|
||||
// CSVManager.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// CSV Log file management
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// MARK: - CSV Manager
|
||||
|
||||
class CSVManager: ObservableObject {
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published var logEntries: [QSOEntry] = []
|
||||
@Published var currentLogFile: URL?
|
||||
@Published var lastError: String?
|
||||
@Published var isSaving = false
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
private let fileManager = FileManager.default
|
||||
private var logDirectory: URL
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init(logDirectory: String = "~/Documents/FT991A-Logs/") {
|
||||
let expandedPath = (logDirectory as NSString).expandingTildeInPath
|
||||
self.logDirectory = URL(fileURLWithPath: expandedPath, isDirectory: true)
|
||||
|
||||
ensureDirectoryExists()
|
||||
}
|
||||
|
||||
// MARK: - Directory Management
|
||||
|
||||
private func ensureDirectoryExists() {
|
||||
if !fileManager.fileExists(atPath: logDirectory.path) {
|
||||
do {
|
||||
try fileManager.createDirectory(at: logDirectory, withIntermediateDirectories: true)
|
||||
Logger.shared.log("Created log directory: \(logDirectory.path)", level: .info)
|
||||
} catch {
|
||||
lastError = "Konnte Log-Verzeichnis nicht erstellen: \(error.localizedDescription)"
|
||||
Logger.shared.log(lastError!, level: .error)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func setLogDirectory(_ path: String) {
|
||||
let expandedPath = (path as NSString).expandingTildeInPath
|
||||
logDirectory = URL(fileURLWithPath: expandedPath, isDirectory: true)
|
||||
ensureDirectoryExists()
|
||||
}
|
||||
|
||||
// MARK: - File Operations
|
||||
|
||||
func createNewLogFile(name: String? = nil) -> URL {
|
||||
let fileName = name ?? generateLogFileName()
|
||||
let fileURL = logDirectory.appendingPathComponent(fileName)
|
||||
|
||||
// Write header
|
||||
do {
|
||||
try QSOEntry.csvHeader.appending("\n").write(to: fileURL, atomically: true, encoding: .utf8)
|
||||
currentLogFile = fileURL
|
||||
Logger.shared.log("Created new log file: \(fileURL.lastPathComponent)", level: .info)
|
||||
} catch {
|
||||
lastError = "Konnte Log-Datei nicht erstellen: \(error.localizedDescription)"
|
||||
Logger.shared.log(lastError!, level: .error)
|
||||
}
|
||||
|
||||
return fileURL
|
||||
}
|
||||
|
||||
private func generateLogFileName() -> String {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateFormat = "yyyy-MM-dd_HHmmss"
|
||||
return "QSO_Log_\(formatter.string(from: Date())).csv"
|
||||
}
|
||||
|
||||
func openLogFile(_ url: URL) -> Bool {
|
||||
guard fileManager.fileExists(atPath: url.path) else {
|
||||
lastError = "Datei existiert nicht: \(url.lastPathComponent)"
|
||||
return false
|
||||
}
|
||||
|
||||
do {
|
||||
let content = try String(contentsOf: url, encoding: .utf8)
|
||||
logEntries = parseCSV(content)
|
||||
currentLogFile = url
|
||||
Logger.shared.log("Opened log file: \(url.lastPathComponent) with \(logEntries.count) entries", level: .info)
|
||||
return true
|
||||
} catch {
|
||||
lastError = "Konnte Datei nicht lesen: \(error.localizedDescription)"
|
||||
Logger.shared.log(lastError!, level: .error)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Parsing
|
||||
|
||||
private func parseCSV(_ content: String) -> [QSOEntry] {
|
||||
var entries: [QSOEntry] = []
|
||||
let lines = content.components(separatedBy: .newlines)
|
||||
|
||||
for (index, line) in lines.enumerated() {
|
||||
// Skip header and empty lines
|
||||
guard index > 0, !line.trimmingCharacters(in: .whitespaces).isEmpty else { continue }
|
||||
|
||||
if let entry = QSOEntry.from(csvLine: line) {
|
||||
entries.append(entry)
|
||||
}
|
||||
}
|
||||
|
||||
return entries
|
||||
}
|
||||
|
||||
// MARK: - Entry Management
|
||||
|
||||
func addEntry(_ entry: QSOEntry) {
|
||||
logEntries.append(entry)
|
||||
saveCurrentLog()
|
||||
}
|
||||
|
||||
func updateEntry(_ entry: QSOEntry) {
|
||||
if let index = logEntries.firstIndex(where: { $0.id == entry.id }) {
|
||||
logEntries[index] = entry
|
||||
saveCurrentLog()
|
||||
}
|
||||
}
|
||||
|
||||
func deleteEntry(_ entry: QSOEntry) {
|
||||
logEntries.removeAll { $0.id == entry.id }
|
||||
saveCurrentLog()
|
||||
}
|
||||
|
||||
func deleteEntries(at offsets: IndexSet) {
|
||||
logEntries.remove(atOffsets: offsets)
|
||||
saveCurrentLog()
|
||||
}
|
||||
|
||||
// MARK: - Saving
|
||||
|
||||
func saveCurrentLog() {
|
||||
guard let fileURL = currentLogFile else {
|
||||
// Create new file if none exists
|
||||
_ = createNewLogFile()
|
||||
guard let newURL = currentLogFile else { return }
|
||||
saveToFile(newURL)
|
||||
return
|
||||
}
|
||||
|
||||
saveToFile(fileURL)
|
||||
}
|
||||
|
||||
private func saveToFile(_ url: URL) {
|
||||
isSaving = true
|
||||
|
||||
var content = QSOEntry.csvHeader + "\n"
|
||||
for entry in logEntries {
|
||||
content += entry.csvLine + "\n"
|
||||
}
|
||||
|
||||
do {
|
||||
try content.write(to: url, atomically: true, encoding: .utf8)
|
||||
Logger.shared.log("Saved \(logEntries.count) entries to \(url.lastPathComponent)", level: .debug)
|
||||
} catch {
|
||||
lastError = "Fehler beim Speichern: \(error.localizedDescription)"
|
||||
Logger.shared.log(lastError!, level: .error)
|
||||
}
|
||||
|
||||
isSaving = false
|
||||
}
|
||||
|
||||
func exportToFile(_ url: URL) -> Bool {
|
||||
var content = QSOEntry.csvHeader + "\n"
|
||||
for entry in logEntries {
|
||||
content += entry.csvLine + "\n"
|
||||
}
|
||||
|
||||
do {
|
||||
try content.write(to: url, atomically: true, encoding: .utf8)
|
||||
Logger.shared.log("Exported \(logEntries.count) entries to \(url.path)", level: .info)
|
||||
return true
|
||||
} catch {
|
||||
lastError = "Export fehlgeschlagen: \(error.localizedDescription)"
|
||||
Logger.shared.log(lastError!, level: .error)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - File Listing
|
||||
|
||||
func listLogFiles() -> [URL] {
|
||||
do {
|
||||
let files = try fileManager.contentsOfDirectory(
|
||||
at: logDirectory,
|
||||
includingPropertiesForKeys: [.creationDateKey],
|
||||
options: [.skipsHiddenFiles]
|
||||
)
|
||||
return files
|
||||
.filter { $0.pathExtension.lowercased() == "csv" }
|
||||
.sorted { url1, url2 in
|
||||
let date1 = (try? url1.resourceValues(forKeys: [.creationDateKey]).creationDate) ?? Date.distantPast
|
||||
let date2 = (try? url2.resourceValues(forKeys: [.creationDateKey]).creationDate) ?? Date.distantPast
|
||||
return date1 > date2
|
||||
}
|
||||
} catch {
|
||||
Logger.shared.log("Error listing log files: \(error)", level: .error)
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Statistics
|
||||
|
||||
var totalQSOs: Int {
|
||||
logEntries.count
|
||||
}
|
||||
|
||||
var uniqueCallsigns: Int {
|
||||
Set(logEntries.map { $0.callsign.uppercased() }).count
|
||||
}
|
||||
|
||||
var bandStatistics: [String: Int] {
|
||||
var stats: [String: Int] = [:]
|
||||
for entry in logEntries {
|
||||
let band = entry.bandDisplay
|
||||
stats[band, default: 0] += 1
|
||||
}
|
||||
return stats
|
||||
}
|
||||
|
||||
var modeStatistics: [String: Int] {
|
||||
var stats: [String: Int] = [:]
|
||||
for entry in logEntries {
|
||||
let mode = entry.mode.rawValue
|
||||
stats[mode, default: 0] += 1
|
||||
}
|
||||
return stats
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,475 @@
|
||||
//
|
||||
// SerialPortManager.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// USB Serial communication for FT-991A (Silicon Labs CP210x)
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import IOKit
|
||||
import IOKit.serial
|
||||
|
||||
// MARK: - Serial Port
|
||||
|
||||
struct SerialPort: Identifiable, Hashable {
|
||||
let id: String
|
||||
let path: String
|
||||
let name: String
|
||||
let vendorID: Int?
|
||||
let productID: Int?
|
||||
let isFT991A: Bool
|
||||
|
||||
init(path: String, name: String, vendorID: Int? = nil, productID: Int? = nil, isFT991A: Bool = false) {
|
||||
self.id = path
|
||||
self.path = path
|
||||
self.name = name
|
||||
self.vendorID = vendorID
|
||||
self.productID = productID
|
||||
self.isFT991A = isFT991A
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Connection State
|
||||
|
||||
enum ConnectionState: Equatable {
|
||||
case disconnected
|
||||
case connecting
|
||||
case connected
|
||||
case error(String)
|
||||
|
||||
var isConnected: Bool {
|
||||
if case .connected = self { return true }
|
||||
return false
|
||||
}
|
||||
|
||||
var displayString: String {
|
||||
switch self {
|
||||
case .disconnected: return "Getrennt"
|
||||
case .connecting: return "Verbinde..."
|
||||
case .connected: return "Verbunden"
|
||||
case .error(let msg): return "Fehler: \(msg)"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Serial Port Manager
|
||||
|
||||
class SerialPortManager: ObservableObject {
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published var connectionState: ConnectionState = .disconnected
|
||||
@Published var availablePorts: [SerialPort] = []
|
||||
@Published var selectedPortPath: String = ""
|
||||
@Published var baudRate: Int = 38400
|
||||
@Published var lastError: String?
|
||||
|
||||
@Published var bytesSent: UInt64 = 0
|
||||
@Published var bytesReceived: UInt64 = 0
|
||||
|
||||
// MARK: - Callbacks
|
||||
|
||||
var onDataReceived: ((Data) -> Void)?
|
||||
var onConnectionChanged: ((Bool) -> Void)?
|
||||
|
||||
// MARK: - Private Properties
|
||||
|
||||
private var fileDescriptor: Int32 = -1
|
||||
private let writeQueue = DispatchQueue(label: "ft991a.serial.write", qos: .userInteractive)
|
||||
private let readQueue = DispatchQueue(label: "ft991a.serial.read", qos: .userInteractive)
|
||||
|
||||
private var readBuffer = Data()
|
||||
private var isReading = false
|
||||
private var readSource: DispatchSourceRead?
|
||||
|
||||
// Auto-reconnect
|
||||
private var reconnectTimer: Timer?
|
||||
private var shouldReconnect = false
|
||||
|
||||
// MARK: - Constants
|
||||
|
||||
private static let CP210X_VENDOR_ID = 0x10C4 // Silicon Labs
|
||||
private static let CP210X_PRODUCT_ID = 0xEA60 // CP210x
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
refreshPorts()
|
||||
}
|
||||
|
||||
deinit {
|
||||
disconnect()
|
||||
}
|
||||
|
||||
// MARK: - Port Discovery
|
||||
|
||||
func refreshPorts() {
|
||||
availablePorts = findSerialPorts()
|
||||
|
||||
// Auto-select FT-991A port (CP210x / SLAB)
|
||||
if let ft991a = availablePorts.first(where: { $0.isFT991A }) {
|
||||
selectedPortPath = ft991a.path
|
||||
} else if selectedPortPath.isEmpty, let first = availablePorts.first {
|
||||
selectedPortPath = first.path
|
||||
}
|
||||
}
|
||||
|
||||
private func findSerialPorts() -> [SerialPort] {
|
||||
var ports: [SerialPort] = []
|
||||
var iterator: io_iterator_t = 0
|
||||
|
||||
let matching = IOServiceMatching(kIOSerialBSDServiceValue)
|
||||
guard IOServiceGetMatchingServices(kIOMainPortDefault, matching, &iterator) == KERN_SUCCESS else {
|
||||
return ports
|
||||
}
|
||||
|
||||
var service = IOIteratorNext(iterator)
|
||||
while service != 0 {
|
||||
defer {
|
||||
IOObjectRelease(service)
|
||||
service = IOIteratorNext(iterator)
|
||||
}
|
||||
|
||||
guard let path = IORegistryEntryCreateCFProperty(
|
||||
service, kIOCalloutDeviceKey as CFString, kCFAllocatorDefault, 0
|
||||
)?.takeRetainedValue() as? String else { continue }
|
||||
|
||||
// Only callout devices (cu.*)
|
||||
guard path.contains("cu.") else { continue }
|
||||
|
||||
var name = path.components(separatedBy: "/").last ?? "Unknown"
|
||||
var vendorID: Int?
|
||||
var productID: Int?
|
||||
var isFT991A = false
|
||||
|
||||
// Check for Silicon Labs CP210x (FT-991A uses this)
|
||||
if path.contains("SLAB_USBtoUART") || path.contains("CP210") {
|
||||
isFT991A = true
|
||||
name = "FT-991A (CP210x)"
|
||||
}
|
||||
|
||||
// Walk USB registry for device info
|
||||
var parent: io_object_t = 0
|
||||
var current = service
|
||||
IOObjectRetain(current)
|
||||
|
||||
for _ in 0..<10 {
|
||||
if IORegistryEntryGetParentEntry(current, kIOServicePlane, &parent) != KERN_SUCCESS { break }
|
||||
IOObjectRelease(current)
|
||||
current = parent
|
||||
|
||||
if let vid = IORegistryEntryCreateCFProperty(current, "idVendor" as CFString, kCFAllocatorDefault, 0)?.takeRetainedValue() as? Int {
|
||||
vendorID = vid
|
||||
}
|
||||
if let pid = IORegistryEntryCreateCFProperty(current, "idProduct" as CFString, kCFAllocatorDefault, 0)?.takeRetainedValue() as? Int {
|
||||
productID = pid
|
||||
}
|
||||
if let usbName = IORegistryEntryCreateCFProperty(current, "USB Product Name" as CFString, kCFAllocatorDefault, 0)?.takeRetainedValue() as? String {
|
||||
if usbName.contains("CP210") || usbName.contains("UART") {
|
||||
name = usbName
|
||||
}
|
||||
}
|
||||
|
||||
// Silicon Labs CP210x = likely FT-991A
|
||||
if vendorID == Self.CP210X_VENDOR_ID && productID == Self.CP210X_PRODUCT_ID {
|
||||
isFT991A = true
|
||||
name = "FT-991A (CP210x)"
|
||||
}
|
||||
|
||||
if vendorID != nil && productID != nil { break }
|
||||
}
|
||||
IOObjectRelease(current)
|
||||
|
||||
ports.append(SerialPort(
|
||||
path: path,
|
||||
name: name,
|
||||
vendorID: vendorID,
|
||||
productID: productID,
|
||||
isFT991A: isFT991A
|
||||
))
|
||||
}
|
||||
|
||||
IOObjectRelease(iterator)
|
||||
|
||||
// Sort: FT-991A first, then alphabetically
|
||||
return ports.sorted { ($0.isFT991A ? 0 : 1, $0.name) < ($1.isFT991A ? 0 : 1, $1.name) }
|
||||
}
|
||||
|
||||
// MARK: - Connection
|
||||
|
||||
func connect() {
|
||||
guard !selectedPortPath.isEmpty else {
|
||||
connectionState = .error("Kein Port ausgewählt")
|
||||
return
|
||||
}
|
||||
|
||||
connectionState = .connecting
|
||||
|
||||
// Open port
|
||||
fileDescriptor = open(selectedPortPath, O_RDWR | O_NOCTTY | O_NONBLOCK)
|
||||
guard fileDescriptor != -1 else {
|
||||
let error = String(cString: strerror(errno))
|
||||
connectionState = .error(error)
|
||||
lastError = error
|
||||
return
|
||||
}
|
||||
|
||||
// Configure serial port
|
||||
if !configurePort() {
|
||||
close(fileDescriptor)
|
||||
fileDescriptor = -1
|
||||
return
|
||||
}
|
||||
|
||||
// Clear buffers
|
||||
tcflush(fileDescriptor, TCIOFLUSH)
|
||||
readBuffer.removeAll()
|
||||
|
||||
// Start reading
|
||||
startReading()
|
||||
|
||||
connectionState = .connected
|
||||
lastError = nil
|
||||
onConnectionChanged?(true)
|
||||
|
||||
Logger.shared.log("Connected to \(selectedPortPath) at \(baudRate) baud", level: .info)
|
||||
}
|
||||
|
||||
private func configurePort() -> Bool {
|
||||
var options = termios()
|
||||
if tcgetattr(fileDescriptor, &options) != 0 {
|
||||
connectionState = .error("Fehler beim Lesen der Port-Einstellungen")
|
||||
return false
|
||||
}
|
||||
|
||||
// Set baud rate
|
||||
let speed = baudRateToSpeed(baudRate)
|
||||
cfsetispeed(&options, speed)
|
||||
cfsetospeed(&options, speed)
|
||||
|
||||
// 8N1 configuration
|
||||
options.c_cflag &= ~UInt(PARENB) // No parity
|
||||
options.c_cflag &= ~UInt(CSTOPB) // 1 stop bit
|
||||
options.c_cflag &= ~UInt(CSIZE) // Clear size bits
|
||||
options.c_cflag |= UInt(CS8) // 8 data bits
|
||||
|
||||
// Enable receiver, ignore modem control
|
||||
options.c_cflag |= UInt(CREAD | CLOCAL)
|
||||
|
||||
// No hardware flow control
|
||||
options.c_cflag &= ~UInt(CRTSCTS)
|
||||
|
||||
// Raw mode (no processing)
|
||||
options.c_lflag &= ~UInt(ICANON | ECHO | ECHOE | ISIG)
|
||||
options.c_oflag &= ~UInt(OPOST)
|
||||
options.c_iflag &= ~UInt(IXON | IXOFF | IXANY | ICRNL | INLCR | IGNBRK)
|
||||
|
||||
// Timeouts
|
||||
options.c_cc.16 = 0 // VMIN - minimum characters
|
||||
options.c_cc.17 = 10 // VTIME - timeout in 0.1s
|
||||
|
||||
if tcsetattr(fileDescriptor, TCSANOW, &options) != 0 {
|
||||
connectionState = .error("Fehler beim Setzen der Port-Einstellungen")
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
private func baudRateToSpeed(_ rate: Int) -> speed_t {
|
||||
switch rate {
|
||||
case 4800: return speed_t(B4800)
|
||||
case 9600: return speed_t(B9600)
|
||||
case 19200: return speed_t(B19200)
|
||||
case 38400: return speed_t(B38400)
|
||||
case 57600: return speed_t(B57600)
|
||||
case 115200: return speed_t(B115200)
|
||||
default: return speed_t(B38400)
|
||||
}
|
||||
}
|
||||
|
||||
func disconnect() {
|
||||
stopReading()
|
||||
stopReconnectTimer()
|
||||
|
||||
if fileDescriptor != -1 {
|
||||
close(fileDescriptor)
|
||||
fileDescriptor = -1
|
||||
}
|
||||
|
||||
connectionState = .disconnected
|
||||
onConnectionChanged?(false)
|
||||
|
||||
Logger.shared.log("Disconnected", level: .info)
|
||||
}
|
||||
|
||||
func toggleConnection() {
|
||||
if connectionState.isConnected {
|
||||
disconnect()
|
||||
} else {
|
||||
connect()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Reading
|
||||
|
||||
private func startReading() {
|
||||
guard fileDescriptor != -1 else { return }
|
||||
|
||||
isReading = true
|
||||
|
||||
readSource = DispatchSource.makeReadSource(fileDescriptor: fileDescriptor, queue: readQueue)
|
||||
readSource?.setEventHandler { [weak self] in
|
||||
self?.readAvailableData()
|
||||
}
|
||||
readSource?.setCancelHandler { [weak self] in
|
||||
self?.isReading = false
|
||||
}
|
||||
readSource?.resume()
|
||||
}
|
||||
|
||||
private func stopReading() {
|
||||
readSource?.cancel()
|
||||
readSource = nil
|
||||
isReading = false
|
||||
}
|
||||
|
||||
private func readAvailableData() {
|
||||
guard fileDescriptor != -1 else { return }
|
||||
|
||||
var buffer = [UInt8](repeating: 0, count: 256)
|
||||
let bytesRead = read(fileDescriptor, &buffer, buffer.count)
|
||||
|
||||
guard bytesRead > 0 else {
|
||||
if bytesRead < 0 && errno != EAGAIN {
|
||||
DispatchQueue.main.async {
|
||||
self.handleReadError()
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
let data = Data(buffer[0..<bytesRead])
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.bytesReceived += UInt64(bytesRead)
|
||||
}
|
||||
|
||||
// Append to buffer
|
||||
readBuffer.append(data)
|
||||
|
||||
// Process complete responses (terminated by ';')
|
||||
processBuffer()
|
||||
}
|
||||
|
||||
private func processBuffer() {
|
||||
while let semicolonIndex = readBuffer.firstIndex(of: 0x3B) { // ';'
|
||||
let responseData = readBuffer.prefix(through: semicolonIndex)
|
||||
readBuffer.removeFirst(semicolonIndex + 1)
|
||||
|
||||
if let response = String(data: Data(responseData), encoding: .ascii) {
|
||||
Logger.shared.log("RX: \(response)", level: .debug)
|
||||
}
|
||||
|
||||
onDataReceived?(Data(responseData))
|
||||
}
|
||||
}
|
||||
|
||||
private func handleReadError() {
|
||||
let error = String(cString: strerror(errno))
|
||||
connectionState = .error(error)
|
||||
lastError = error
|
||||
|
||||
if shouldReconnect {
|
||||
startReconnectTimer()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Writing
|
||||
|
||||
func send(_ data: Data) {
|
||||
guard fileDescriptor != -1 else { return }
|
||||
|
||||
writeQueue.async { [weak self] in
|
||||
guard let self = self, self.fileDescriptor != -1 else { return }
|
||||
|
||||
let written = data.withUnsafeBytes { buffer -> Int in
|
||||
guard let base = buffer.baseAddress else { return -1 }
|
||||
return write(self.fileDescriptor, base, data.count)
|
||||
}
|
||||
|
||||
if written > 0 {
|
||||
DispatchQueue.main.async {
|
||||
self.bytesSent += UInt64(written)
|
||||
}
|
||||
|
||||
if let command = String(data: data, encoding: .ascii) {
|
||||
Logger.shared.log("TX: \(command.trimmingCharacters(in: .whitespaces))", level: .debug)
|
||||
}
|
||||
} else if written < 0 {
|
||||
DispatchQueue.main.async {
|
||||
self.handleWriteError()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func send(_ command: CATCommand) {
|
||||
send(command.data)
|
||||
}
|
||||
|
||||
func sendString(_ string: String) {
|
||||
if let data = string.data(using: .ascii) {
|
||||
send(data)
|
||||
}
|
||||
}
|
||||
|
||||
private func handleWriteError() {
|
||||
let error = String(cString: strerror(errno))
|
||||
connectionState = .error(error)
|
||||
lastError = error
|
||||
}
|
||||
|
||||
// MARK: - Auto-Reconnect
|
||||
|
||||
func enableAutoReconnect(_ enabled: Bool) {
|
||||
shouldReconnect = enabled
|
||||
if !enabled {
|
||||
stopReconnectTimer()
|
||||
}
|
||||
}
|
||||
|
||||
private func startReconnectTimer() {
|
||||
stopReconnectTimer()
|
||||
|
||||
reconnectTimer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { [weak self] _ in
|
||||
guard let self = self else { return }
|
||||
|
||||
Logger.shared.log("Attempting to reconnect...", level: .info)
|
||||
|
||||
self.refreshPorts()
|
||||
if self.availablePorts.contains(where: { $0.path == self.selectedPortPath }) {
|
||||
self.connect()
|
||||
if self.connectionState.isConnected {
|
||||
self.stopReconnectTimer()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func stopReconnectTimer() {
|
||||
reconnectTimer?.invalidate()
|
||||
reconnectTimer = nil
|
||||
}
|
||||
|
||||
// MARK: - Statistics
|
||||
|
||||
func resetStatistics() {
|
||||
bytesSent = 0
|
||||
bytesReceived = 0
|
||||
}
|
||||
|
||||
var isConnected: Bool {
|
||||
connectionState.isConnected
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
/* German Localization for FT991A-Remote */
|
||||
|
||||
/* Connection */
|
||||
"Connected" = "Verbunden";
|
||||
"Disconnected" = "Getrennt";
|
||||
"Connecting" = "Verbinde...";
|
||||
"Connect" = "Verbinden";
|
||||
"Disconnect" = "Trennen";
|
||||
"Select Port" = "Port wählen...";
|
||||
"Refresh Ports" = "Ports aktualisieren";
|
||||
"No Port Selected" = "Kein Port ausgewählt";
|
||||
"Connection Error" = "Verbindungsfehler";
|
||||
"Auto Reconnect" = "Auto-Reconnect";
|
||||
|
||||
/* Frequency */
|
||||
"Frequency" = "Frequenz";
|
||||
"Step" = "Schritt";
|
||||
"VFO-A" = "VFO-A";
|
||||
"VFO-B" = "VFO-B";
|
||||
"Swap VFO" = "VFO tauschen";
|
||||
"Band" = "Band";
|
||||
|
||||
/* Modes */
|
||||
"Mode" = "Betriebsart";
|
||||
"Filter Width" = "Filterbreite";
|
||||
"Filter Shift" = "Filter-Shift";
|
||||
|
||||
/* Levels */
|
||||
"Levels" = "Pegel";
|
||||
"AF Gain" = "AF Verstärkung";
|
||||
"RF Gain" = "RF Verstärkung";
|
||||
"Squelch" = "Squelch";
|
||||
"MIC Gain" = "MIC Verstärkung";
|
||||
"Power" = "Leistung";
|
||||
|
||||
/* Functions */
|
||||
"Functions" = "Funktionen";
|
||||
"Noise Blanker" = "Störaustaster";
|
||||
"Noise Reduction" = "Rauschminderung";
|
||||
"ATU Tune" = "Tuner abstimmen";
|
||||
"Split" = "Split-Betrieb";
|
||||
|
||||
/* Metering */
|
||||
"Metering" = "Messwerte";
|
||||
"S-Meter" = "S-Meter";
|
||||
"Power Meter" = "Leistungsmesser";
|
||||
"SWR Meter" = "SWR-Meter";
|
||||
|
||||
/* PTT */
|
||||
"PTT" = "PTT";
|
||||
"Transmit" = "Senden";
|
||||
"Receive" = "Empfangen";
|
||||
"TX" = "TX";
|
||||
"RX" = "RX";
|
||||
"Hold Shift for PTT" = "Shift-Taste gedrückt halten = PTT";
|
||||
|
||||
/* Log */
|
||||
"QSO Log" = "QSO Log";
|
||||
"Add QSO" = "QSO hinzufügen";
|
||||
"Edit QSO" = "QSO bearbeiten";
|
||||
"Delete QSO" = "QSO löschen";
|
||||
"Callsign" = "Rufzeichen";
|
||||
"Date" = "Datum";
|
||||
"Time" = "Zeit";
|
||||
"RST Sent" = "RST gesendet";
|
||||
"RST Received" = "RST empfangen";
|
||||
"Name" = "Name";
|
||||
"QTH" = "QTH";
|
||||
"Locator" = "Locator";
|
||||
"Notes" = "Notizen";
|
||||
"Search" = "Suchen...";
|
||||
"Export" = "Exportieren";
|
||||
"Import" = "Importieren";
|
||||
|
||||
/* Debug */
|
||||
"CAT Console" = "CAT Konsole";
|
||||
"Send Command" = "Befehl senden";
|
||||
"Clear History" = "Verlauf löschen";
|
||||
"Auto Scroll" = "Auto-Scroll";
|
||||
"Bytes Sent" = "Bytes gesendet";
|
||||
"Bytes Received" = "Bytes empfangen";
|
||||
"Commands" = "Befehle";
|
||||
|
||||
/* Settings */
|
||||
"Settings" = "Einstellungen";
|
||||
"Connection" = "Verbindung";
|
||||
"Interface" = "Oberfläche";
|
||||
"Audio" = "Audio";
|
||||
"Keyboard" = "Tastatur";
|
||||
"Logging" = "Logging";
|
||||
"UI Style" = "UI-Stil";
|
||||
"Modern" = "Modern";
|
||||
"Front Panel" = "Frontpanel";
|
||||
"Language" = "Sprache";
|
||||
"German" = "Deutsch";
|
||||
"English" = "English";
|
||||
"Frequency Step" = "Frequenzschritt";
|
||||
"Log Directory" = "Log-Verzeichnis";
|
||||
"Auto Save" = "Automatisch speichern";
|
||||
"Reset to Defaults" = "Auf Standard zurücksetzen";
|
||||
|
||||
/* Audio */
|
||||
"Audio Routing" = "Audio-Routing";
|
||||
"Input Device" = "Eingabegerät";
|
||||
"Output Device" = "Ausgabegerät";
|
||||
"BlackHole Status" = "BlackHole Status";
|
||||
"Installed" = "Installiert";
|
||||
"Not Found" = "Nicht gefunden";
|
||||
"Configure for Digital Modes" = "Für Digimodes konfigurieren";
|
||||
"Use BlackHole" = "BlackHole verwenden";
|
||||
|
||||
/* Menu */
|
||||
"Radio" = "Radio";
|
||||
"View" = "Ansicht";
|
||||
"Show Debug Panel" = "Debug-Panel anzeigen";
|
||||
"Show Log Panel" = "Log-Panel anzeigen";
|
||||
"Open Main Window" = "Hauptfenster öffnen";
|
||||
"Quit" = "Beenden";
|
||||
|
||||
/* Errors */
|
||||
"Error" = "Fehler";
|
||||
"Failed to connect" = "Verbindung fehlgeschlagen";
|
||||
"Failed to open port" = "Port konnte nicht geöffnet werden";
|
||||
"No serial ports found" = "Keine seriellen Ports gefunden";
|
||||
"Save failed" = "Speichern fehlgeschlagen";
|
||||
"Export failed" = "Export fehlgeschlagen";
|
||||
@@ -0,0 +1,126 @@
|
||||
/* English Localization for FT991A-Remote */
|
||||
|
||||
/* Connection */
|
||||
"Connected" = "Connected";
|
||||
"Disconnected" = "Disconnected";
|
||||
"Connecting" = "Connecting...";
|
||||
"Connect" = "Connect";
|
||||
"Disconnect" = "Disconnect";
|
||||
"Select Port" = "Select Port...";
|
||||
"Refresh Ports" = "Refresh Ports";
|
||||
"No Port Selected" = "No Port Selected";
|
||||
"Connection Error" = "Connection Error";
|
||||
"Auto Reconnect" = "Auto Reconnect";
|
||||
|
||||
/* Frequency */
|
||||
"Frequency" = "Frequency";
|
||||
"Step" = "Step";
|
||||
"VFO-A" = "VFO-A";
|
||||
"VFO-B" = "VFO-B";
|
||||
"Swap VFO" = "Swap VFO";
|
||||
"Band" = "Band";
|
||||
|
||||
/* Modes */
|
||||
"Mode" = "Mode";
|
||||
"Filter Width" = "Filter Width";
|
||||
"Filter Shift" = "Filter Shift";
|
||||
|
||||
/* Levels */
|
||||
"Levels" = "Levels";
|
||||
"AF Gain" = "AF Gain";
|
||||
"RF Gain" = "RF Gain";
|
||||
"Squelch" = "Squelch";
|
||||
"MIC Gain" = "MIC Gain";
|
||||
"Power" = "Power";
|
||||
|
||||
/* Functions */
|
||||
"Functions" = "Functions";
|
||||
"Noise Blanker" = "Noise Blanker";
|
||||
"Noise Reduction" = "Noise Reduction";
|
||||
"ATU Tune" = "ATU Tune";
|
||||
"Split" = "Split";
|
||||
|
||||
/* Metering */
|
||||
"Metering" = "Metering";
|
||||
"S-Meter" = "S-Meter";
|
||||
"Power Meter" = "Power Meter";
|
||||
"SWR Meter" = "SWR Meter";
|
||||
|
||||
/* PTT */
|
||||
"PTT" = "PTT";
|
||||
"Transmit" = "Transmit";
|
||||
"Receive" = "Receive";
|
||||
"TX" = "TX";
|
||||
"RX" = "RX";
|
||||
"Hold Shift for PTT" = "Hold Shift key for PTT";
|
||||
|
||||
/* Log */
|
||||
"QSO Log" = "QSO Log";
|
||||
"Add QSO" = "Add QSO";
|
||||
"Edit QSO" = "Edit QSO";
|
||||
"Delete QSO" = "Delete QSO";
|
||||
"Callsign" = "Callsign";
|
||||
"Date" = "Date";
|
||||
"Time" = "Time";
|
||||
"RST Sent" = "RST Sent";
|
||||
"RST Received" = "RST Received";
|
||||
"Name" = "Name";
|
||||
"QTH" = "QTH";
|
||||
"Locator" = "Locator";
|
||||
"Notes" = "Notes";
|
||||
"Search" = "Search...";
|
||||
"Export" = "Export";
|
||||
"Import" = "Import";
|
||||
|
||||
/* Debug */
|
||||
"CAT Console" = "CAT Console";
|
||||
"Send Command" = "Send Command";
|
||||
"Clear History" = "Clear History";
|
||||
"Auto Scroll" = "Auto Scroll";
|
||||
"Bytes Sent" = "Bytes Sent";
|
||||
"Bytes Received" = "Bytes Received";
|
||||
"Commands" = "Commands";
|
||||
|
||||
/* Settings */
|
||||
"Settings" = "Settings";
|
||||
"Connection" = "Connection";
|
||||
"Interface" = "Interface";
|
||||
"Audio" = "Audio";
|
||||
"Keyboard" = "Keyboard";
|
||||
"Logging" = "Logging";
|
||||
"UI Style" = "UI Style";
|
||||
"Modern" = "Modern";
|
||||
"Front Panel" = "Front Panel";
|
||||
"Language" = "Language";
|
||||
"German" = "German";
|
||||
"English" = "English";
|
||||
"Frequency Step" = "Frequency Step";
|
||||
"Log Directory" = "Log Directory";
|
||||
"Auto Save" = "Auto Save";
|
||||
"Reset to Defaults" = "Reset to Defaults";
|
||||
|
||||
/* Audio */
|
||||
"Audio Routing" = "Audio Routing";
|
||||
"Input Device" = "Input Device";
|
||||
"Output Device" = "Output Device";
|
||||
"BlackHole Status" = "BlackHole Status";
|
||||
"Installed" = "Installed";
|
||||
"Not Found" = "Not Found";
|
||||
"Configure for Digital Modes" = "Configure for Digital Modes";
|
||||
"Use BlackHole" = "Use BlackHole";
|
||||
|
||||
/* Menu */
|
||||
"Radio" = "Radio";
|
||||
"View" = "View";
|
||||
"Show Debug Panel" = "Show Debug Panel";
|
||||
"Show Log Panel" = "Show Log Panel";
|
||||
"Open Main Window" = "Open Main Window";
|
||||
"Quit" = "Quit";
|
||||
|
||||
/* Errors */
|
||||
"Error" = "Error";
|
||||
"Failed to connect" = "Failed to connect";
|
||||
"Failed to open port" = "Failed to open port";
|
||||
"No serial ports found" = "No serial ports found";
|
||||
"Save failed" = "Save failed";
|
||||
"Export failed" = "Export failed";
|
||||
@@ -0,0 +1,223 @@
|
||||
//
|
||||
// Logger.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Debug logging system
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import os.log
|
||||
|
||||
// MARK: - Log Level
|
||||
|
||||
enum LogLevel: String, Comparable {
|
||||
case debug = "DEBUG"
|
||||
case info = "INFO"
|
||||
case warning = "WARN"
|
||||
case error = "ERROR"
|
||||
|
||||
var osLogType: OSLogType {
|
||||
switch self {
|
||||
case .debug: return .debug
|
||||
case .info: return .info
|
||||
case .warning: return .default
|
||||
case .error: return .error
|
||||
}
|
||||
}
|
||||
|
||||
var symbol: String {
|
||||
switch self {
|
||||
case .debug: return "🔍"
|
||||
case .info: return "ℹ️"
|
||||
case .warning: return "⚠️"
|
||||
case .error: return "❌"
|
||||
}
|
||||
}
|
||||
|
||||
static func < (lhs: LogLevel, rhs: LogLevel) -> Bool {
|
||||
let order: [LogLevel] = [.debug, .info, .warning, .error]
|
||||
guard let lhsIndex = order.firstIndex(of: lhs),
|
||||
let rhsIndex = order.firstIndex(of: rhs) else { return false }
|
||||
return lhsIndex < rhsIndex
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Log Entry
|
||||
|
||||
struct LogEntry: Identifiable {
|
||||
let id = UUID()
|
||||
let timestamp: Date
|
||||
let level: LogLevel
|
||||
let message: String
|
||||
let file: String
|
||||
let function: String
|
||||
let line: Int
|
||||
|
||||
var timeString: String {
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateFormat = "HH:mm:ss.SSS"
|
||||
return formatter.string(from: timestamp)
|
||||
}
|
||||
|
||||
var shortFile: String {
|
||||
URL(fileURLWithPath: file).lastPathComponent
|
||||
}
|
||||
|
||||
var formattedMessage: String {
|
||||
"[\(timeString)] [\(level.rawValue)] \(message)"
|
||||
}
|
||||
|
||||
var detailedMessage: String {
|
||||
"[\(timeString)] [\(level.rawValue)] [\(shortFile):\(line)] \(message)"
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Logger
|
||||
|
||||
class Logger: ObservableObject {
|
||||
|
||||
// MARK: - Singleton
|
||||
|
||||
static let shared = Logger()
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published var entries: [LogEntry] = []
|
||||
@Published var minimumLevel: LogLevel = .debug
|
||||
@Published var isLoggingEnabled = true
|
||||
|
||||
// MARK: - Private Properties
|
||||
|
||||
private let osLog = OSLog(subsystem: "com.ft991a.remote", category: "General")
|
||||
private let queue = DispatchQueue(label: "logger.queue", qos: .utility)
|
||||
private let maxEntries = 1000
|
||||
|
||||
// File logging
|
||||
private var logFileURL: URL?
|
||||
private var logFileHandle: FileHandle?
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
private init() {
|
||||
setupFileLogging()
|
||||
}
|
||||
|
||||
deinit {
|
||||
logFileHandle?.closeFile()
|
||||
}
|
||||
|
||||
// MARK: - Logging
|
||||
|
||||
func log(
|
||||
_ message: String,
|
||||
level: LogLevel = .info,
|
||||
file: String = #file,
|
||||
function: String = #function,
|
||||
line: Int = #line
|
||||
) {
|
||||
guard isLoggingEnabled, level >= minimumLevel else { return }
|
||||
|
||||
let entry = LogEntry(
|
||||
timestamp: Date(),
|
||||
level: level,
|
||||
message: message,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line
|
||||
)
|
||||
|
||||
// Console output
|
||||
queue.async {
|
||||
os_log("%{public}@", log: self.osLog, type: level.osLogType, entry.formattedMessage)
|
||||
#if DEBUG
|
||||
print(entry.detailedMessage)
|
||||
#endif
|
||||
}
|
||||
|
||||
// In-memory storage
|
||||
DispatchQueue.main.async {
|
||||
self.entries.append(entry)
|
||||
if self.entries.count > self.maxEntries {
|
||||
self.entries.removeFirst(100)
|
||||
}
|
||||
}
|
||||
|
||||
// File logging
|
||||
writeToFile(entry)
|
||||
}
|
||||
|
||||
// MARK: - Convenience Methods
|
||||
|
||||
func debug(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
log(message, level: .debug, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
func info(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
log(message, level: .info, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
func warning(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
log(message, level: .warning, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
func error(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
log(message, level: .error, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
// MARK: - File Logging
|
||||
|
||||
private func setupFileLogging() {
|
||||
let fileManager = FileManager.default
|
||||
guard let logsDir = fileManager.urls(for: .applicationSupportDirectory, in: .userDomainMask).first else { return }
|
||||
|
||||
let appLogsDir = logsDir.appendingPathComponent("FT991A-Remote/Logs", isDirectory: true)
|
||||
|
||||
do {
|
||||
try fileManager.createDirectory(at: appLogsDir, withIntermediateDirectories: true)
|
||||
|
||||
let formatter = DateFormatter()
|
||||
formatter.dateFormat = "yyyy-MM-dd"
|
||||
let fileName = "ft991a_\(formatter.string(from: Date())).log"
|
||||
|
||||
logFileURL = appLogsDir.appendingPathComponent(fileName)
|
||||
|
||||
if !fileManager.fileExists(atPath: logFileURL!.path) {
|
||||
fileManager.createFile(atPath: logFileURL!.path, contents: nil)
|
||||
}
|
||||
|
||||
logFileHandle = try FileHandle(forWritingTo: logFileURL!)
|
||||
logFileHandle?.seekToEndOfFile()
|
||||
|
||||
let header = "\n=== FT-991A Remote Log Started at \(Date()) ===\n"
|
||||
if let data = header.data(using: .utf8) {
|
||||
logFileHandle?.write(data)
|
||||
}
|
||||
} catch {
|
||||
print("Failed to setup file logging: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
private func writeToFile(_ entry: LogEntry) {
|
||||
guard let handle = logFileHandle else { return }
|
||||
|
||||
queue.async {
|
||||
if let data = (entry.detailedMessage + "\n").data(using: .utf8) {
|
||||
handle.write(data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Management
|
||||
|
||||
func clear() {
|
||||
entries.removeAll()
|
||||
}
|
||||
|
||||
func exportLogs() -> String {
|
||||
entries.map { $0.detailedMessage }.joined(separator: "\n")
|
||||
}
|
||||
|
||||
var filteredEntries: [LogEntry] {
|
||||
entries.filter { $0.level >= minimumLevel }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,211 @@
|
||||
//
|
||||
// LogViewModel.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// ViewModel for QSO logging
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Log ViewModel
|
||||
|
||||
@MainActor
|
||||
class LogViewModel: ObservableObject {
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published var entries: [QSOEntry] = []
|
||||
@Published var selectedEntry: QSOEntry?
|
||||
@Published var searchText = ""
|
||||
@Published var sortOrder: SortOrder = .dateDescending
|
||||
|
||||
// Current QSO being logged
|
||||
@Published var currentQSO = QSOEntry()
|
||||
|
||||
// File management
|
||||
@Published var currentLogFile: URL?
|
||||
@Published var availableLogFiles: [URL] = []
|
||||
@Published var isSaving = false
|
||||
@Published var lastError: String?
|
||||
|
||||
// MARK: - Private Properties
|
||||
|
||||
private let csvManager = CSVManager()
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
||||
// MARK: - Computed Properties
|
||||
|
||||
var filteredEntries: [QSOEntry] {
|
||||
var result = entries
|
||||
|
||||
// Apply search filter
|
||||
if !searchText.isEmpty {
|
||||
let search = searchText.lowercased()
|
||||
result = result.filter {
|
||||
$0.callsign.lowercased().contains(search) ||
|
||||
$0.name.lowercased().contains(search) ||
|
||||
$0.qth.lowercased().contains(search) ||
|
||||
$0.notes.lowercased().contains(search)
|
||||
}
|
||||
}
|
||||
|
||||
// Apply sorting
|
||||
switch sortOrder {
|
||||
case .dateDescending:
|
||||
result.sort { $0.date > $1.date }
|
||||
case .dateAscending:
|
||||
result.sort { $0.date < $1.date }
|
||||
case .callsignAscending:
|
||||
result.sort { $0.callsign < $1.callsign }
|
||||
case .callsignDescending:
|
||||
result.sort { $0.callsign > $1.callsign }
|
||||
case .frequencyAscending:
|
||||
result.sort { $0.frequency < $1.frequency }
|
||||
case .frequencyDescending:
|
||||
result.sort { $0.frequency > $1.frequency }
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
var totalQSOs: Int {
|
||||
entries.count
|
||||
}
|
||||
|
||||
var uniqueCallsigns: Int {
|
||||
Set(entries.map { $0.callsign.uppercased() }).count
|
||||
}
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
setupBindings()
|
||||
refreshLogFiles()
|
||||
loadLatestLog()
|
||||
}
|
||||
|
||||
private func setupBindings() {
|
||||
csvManager.$logEntries
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$entries)
|
||||
|
||||
csvManager.$currentLogFile
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$currentLogFile)
|
||||
|
||||
csvManager.$isSaving
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$isSaving)
|
||||
|
||||
csvManager.$lastError
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$lastError)
|
||||
}
|
||||
|
||||
// MARK: - File Management
|
||||
|
||||
func refreshLogFiles() {
|
||||
availableLogFiles = csvManager.listLogFiles()
|
||||
}
|
||||
|
||||
func loadLatestLog() {
|
||||
if let latest = availableLogFiles.first {
|
||||
_ = csvManager.openLogFile(latest)
|
||||
}
|
||||
}
|
||||
|
||||
func openLogFile(_ url: URL) {
|
||||
_ = csvManager.openLogFile(url)
|
||||
}
|
||||
|
||||
func createNewLogFile(name: String? = nil) {
|
||||
_ = csvManager.createNewLogFile(name: name)
|
||||
refreshLogFiles()
|
||||
}
|
||||
|
||||
func exportToFile(_ url: URL) -> Bool {
|
||||
csvManager.exportToFile(url)
|
||||
}
|
||||
|
||||
func setLogDirectory(_ path: String) {
|
||||
csvManager.setLogDirectory(path)
|
||||
refreshLogFiles()
|
||||
}
|
||||
|
||||
// MARK: - QSO Management
|
||||
|
||||
func addQSO() {
|
||||
guard !currentQSO.callsign.isEmpty else { return }
|
||||
|
||||
var entry = currentQSO
|
||||
entry.callsign = entry.callsign.uppercased()
|
||||
|
||||
csvManager.addEntry(entry)
|
||||
resetCurrentQSO()
|
||||
|
||||
Logger.shared.log("Added QSO: \(entry.callsign)", level: .info)
|
||||
}
|
||||
|
||||
func updateQSO(_ entry: QSOEntry) {
|
||||
csvManager.updateEntry(entry)
|
||||
}
|
||||
|
||||
func deleteQSO(_ entry: QSOEntry) {
|
||||
csvManager.deleteEntry(entry)
|
||||
}
|
||||
|
||||
func deleteQSOs(at offsets: IndexSet) {
|
||||
// Convert offsets from filtered to original indices
|
||||
let entriesToDelete = offsets.map { filteredEntries[$0] }
|
||||
for entry in entriesToDelete {
|
||||
csvManager.deleteEntry(entry)
|
||||
}
|
||||
}
|
||||
|
||||
func resetCurrentQSO() {
|
||||
currentQSO = QSOEntry()
|
||||
}
|
||||
|
||||
// MARK: - Radio Integration
|
||||
|
||||
func updateFromRadio(frequency: Int, mode: OperatingMode, power: Int) {
|
||||
currentQSO.frequency = frequency
|
||||
currentQSO.mode = mode
|
||||
currentQSO.power = power
|
||||
}
|
||||
|
||||
// MARK: - Statistics
|
||||
|
||||
var bandStatistics: [(band: String, count: Int)] {
|
||||
var stats: [String: Int] = [:]
|
||||
for entry in entries {
|
||||
let band = entry.bandDisplay
|
||||
stats[band, default: 0] += 1
|
||||
}
|
||||
return stats.map { (band: $0.key, count: $0.value) }
|
||||
.sorted { $0.count > $1.count }
|
||||
}
|
||||
|
||||
var modeStatistics: [(mode: String, count: Int)] {
|
||||
var stats: [String: Int] = [:]
|
||||
for entry in entries {
|
||||
let mode = entry.mode.rawValue
|
||||
stats[mode, default: 0] += 1
|
||||
}
|
||||
return stats.map { (mode: $0.key, count: $0.value) }
|
||||
.sorted { $0.count > $1.count }
|
||||
}
|
||||
|
||||
// MARK: - Sort Order
|
||||
|
||||
enum SortOrder: String, CaseIterable {
|
||||
case dateDescending = "Datum (neu → alt)"
|
||||
case dateAscending = "Datum (alt → neu)"
|
||||
case callsignAscending = "Rufzeichen (A → Z)"
|
||||
case callsignDescending = "Rufzeichen (Z → A)"
|
||||
case frequencyAscending = "Frequenz (niedrig → hoch)"
|
||||
case frequencyDescending = "Frequenz (hoch → niedrig)"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,306 @@
|
||||
//
|
||||
// RadioViewModel.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Main ViewModel for radio control
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Radio ViewModel
|
||||
|
||||
@MainActor
|
||||
class RadioViewModel: ObservableObject {
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
// Connection
|
||||
@Published var isConnected = false
|
||||
@Published var connectionState: ConnectionState = .disconnected
|
||||
@Published var availablePorts: [SerialPort] = []
|
||||
@Published var selectedPort: String = ""
|
||||
@Published var baudRate: Int = 38400
|
||||
|
||||
// Radio State (mirrored for convenience)
|
||||
@Published var vfoAFrequency: Int = 14_250_000
|
||||
@Published var vfoBFrequency: Int = 14_255_000
|
||||
@Published var activeVFO: VFO = .a
|
||||
@Published var mode: OperatingMode = .usb
|
||||
@Published var frequencyStep: FrequencyStep = .khz1
|
||||
|
||||
// Levels
|
||||
@Published var afGain: Int = 128
|
||||
@Published var rfGain: Int = 255
|
||||
@Published var squelch: Int = 0
|
||||
@Published var micGain: Int = 50
|
||||
@Published var power: Int = 100
|
||||
|
||||
// Functions
|
||||
@Published var noiseBlanker = false
|
||||
@Published var noiseReduction = false
|
||||
@Published var dnf = false
|
||||
@Published var contour = false
|
||||
@Published var atu = false
|
||||
@Published var split = false
|
||||
@Published var ipo = false
|
||||
|
||||
// Metering
|
||||
@Published var sMeter: Int = 0
|
||||
@Published var powerMeter: Int = 0
|
||||
@Published var swrMeter: Int = 0
|
||||
@Published var isTransmitting = false
|
||||
|
||||
// Statistics
|
||||
@Published var bytesSent: UInt64 = 0
|
||||
@Published var bytesReceived: UInt64 = 0
|
||||
|
||||
// Debug
|
||||
@Published var commandHistory: [CommandLogEntry] = []
|
||||
|
||||
// MARK: - Services
|
||||
|
||||
private let serialManager = SerialPortManager()
|
||||
private let catProtocol: CATProtocol
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
||||
// MARK: - Computed Properties
|
||||
|
||||
var activeFrequency: Int {
|
||||
activeVFO == .a ? vfoAFrequency : vfoBFrequency
|
||||
}
|
||||
|
||||
var frequencyDisplay: String {
|
||||
formatFrequency(activeFrequency)
|
||||
}
|
||||
|
||||
var sMeterDisplay: String {
|
||||
let normalized = Double(sMeter) / 255.0
|
||||
if normalized <= 0.6 {
|
||||
let sUnit = Int(normalized / 0.6 * 9.0)
|
||||
return "S\(sUnit)"
|
||||
} else {
|
||||
let db = Int((normalized - 0.6) / 0.4 * 60.0)
|
||||
return "S9+\(db)"
|
||||
}
|
||||
}
|
||||
|
||||
var currentBand: Band? {
|
||||
Band.from(frequency: activeFrequency)
|
||||
}
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
catProtocol = CATProtocol(serialManager: serialManager)
|
||||
setupBindings()
|
||||
refreshPorts()
|
||||
}
|
||||
|
||||
private func setupBindings() {
|
||||
// Serial Manager bindings
|
||||
serialManager.$connectionState
|
||||
.receive(on: DispatchQueue.main)
|
||||
.sink { [weak self] state in
|
||||
self?.connectionState = state
|
||||
self?.isConnected = state.isConnected
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
|
||||
serialManager.$availablePorts
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$availablePorts)
|
||||
|
||||
serialManager.$selectedPortPath
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$selectedPort)
|
||||
|
||||
serialManager.$bytesSent
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$bytesSent)
|
||||
|
||||
serialManager.$bytesReceived
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$bytesReceived)
|
||||
|
||||
// CAT Protocol bindings
|
||||
catProtocol.$radioState
|
||||
.receive(on: DispatchQueue.main)
|
||||
.sink { [weak self] state in
|
||||
self?.updateFromRadioState(state)
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
|
||||
catProtocol.$commandHistory
|
||||
.receive(on: DispatchQueue.main)
|
||||
.assign(to: &$commandHistory)
|
||||
}
|
||||
|
||||
private func updateFromRadioState(_ state: RadioState) {
|
||||
vfoAFrequency = state.vfoAFrequency
|
||||
vfoBFrequency = state.vfoBFrequency
|
||||
activeVFO = state.activeVFO
|
||||
mode = state.mode
|
||||
afGain = state.afGain
|
||||
rfGain = state.rfGain
|
||||
squelch = state.squelch
|
||||
micGain = state.micGain
|
||||
power = state.power
|
||||
noiseBlanker = state.noiseBlanker
|
||||
noiseReduction = state.noiseReduction
|
||||
dnf = state.dnf
|
||||
contour = state.contour
|
||||
atu = state.atu
|
||||
split = state.split
|
||||
ipo = state.ipo
|
||||
sMeter = state.sMeter
|
||||
powerMeter = state.powerMeter
|
||||
swrMeter = state.swrMeter
|
||||
isTransmitting = state.isTransmitting
|
||||
}
|
||||
|
||||
// MARK: - Connection
|
||||
|
||||
func refreshPorts() {
|
||||
serialManager.refreshPorts()
|
||||
}
|
||||
|
||||
func connect() {
|
||||
serialManager.selectedPortPath = selectedPort
|
||||
serialManager.baudRate = baudRate
|
||||
serialManager.connect()
|
||||
}
|
||||
|
||||
func disconnect() {
|
||||
serialManager.disconnect()
|
||||
}
|
||||
|
||||
func toggleConnection() {
|
||||
if isConnected {
|
||||
disconnect()
|
||||
} else {
|
||||
connect()
|
||||
}
|
||||
}
|
||||
|
||||
func selectPort(_ path: String) {
|
||||
selectedPort = path
|
||||
serialManager.selectedPortPath = path
|
||||
}
|
||||
|
||||
// MARK: - Frequency Control
|
||||
|
||||
func setFrequency(_ frequency: Int) {
|
||||
catProtocol.setFrequency(frequency, vfo: activeVFO)
|
||||
}
|
||||
|
||||
func incrementFrequency() {
|
||||
catProtocol.changeFrequency(by: frequencyStep.rawValue)
|
||||
}
|
||||
|
||||
func decrementFrequency() {
|
||||
catProtocol.changeFrequency(by: -frequencyStep.rawValue)
|
||||
}
|
||||
|
||||
func selectBand(_ band: Band) {
|
||||
catProtocol.selectBand(band)
|
||||
}
|
||||
|
||||
// MARK: - VFO Control
|
||||
|
||||
func selectVFO(_ vfo: VFO) {
|
||||
catProtocol.selectVFO(vfo)
|
||||
}
|
||||
|
||||
func swapVFO() {
|
||||
catProtocol.swapVFO()
|
||||
}
|
||||
|
||||
func equalizeVFO() {
|
||||
catProtocol.equalizeVFO()
|
||||
}
|
||||
|
||||
// MARK: - Mode Control
|
||||
|
||||
func setMode(_ mode: OperatingMode) {
|
||||
catProtocol.setMode(mode)
|
||||
}
|
||||
|
||||
// MARK: - Level Control
|
||||
|
||||
func setAFGain(_ value: Int) {
|
||||
catProtocol.setAFGain(value)
|
||||
}
|
||||
|
||||
func setRFGain(_ value: Int) {
|
||||
catProtocol.setRFGain(value)
|
||||
}
|
||||
|
||||
func setSquelch(_ value: Int) {
|
||||
catProtocol.setSquelch(value)
|
||||
}
|
||||
|
||||
func setMICGain(_ value: Int) {
|
||||
catProtocol.setMICGain(value)
|
||||
}
|
||||
|
||||
func setPower(_ value: Int) {
|
||||
catProtocol.setPower(value)
|
||||
}
|
||||
|
||||
// MARK: - Function Control
|
||||
|
||||
func toggleNB() {
|
||||
catProtocol.toggleNB()
|
||||
}
|
||||
|
||||
func toggleNR() {
|
||||
catProtocol.toggleNR()
|
||||
}
|
||||
|
||||
func toggleDNF() {
|
||||
catProtocol.toggleDNF()
|
||||
}
|
||||
|
||||
func toggleSplit() {
|
||||
catProtocol.toggleSplit()
|
||||
}
|
||||
|
||||
func startATUTune() {
|
||||
catProtocol.startATUTune()
|
||||
}
|
||||
|
||||
// MARK: - PTT Control
|
||||
|
||||
func startTransmit(dataMode: Bool = false) {
|
||||
catProtocol.startTransmit(dataMode: dataMode)
|
||||
}
|
||||
|
||||
func stopTransmit() {
|
||||
catProtocol.stopTransmit()
|
||||
}
|
||||
|
||||
func toggleTransmit(dataMode: Bool = false) {
|
||||
catProtocol.toggleTransmit(dataMode: dataMode)
|
||||
}
|
||||
|
||||
// MARK: - Debug
|
||||
|
||||
func sendRawCommand(_ command: String) {
|
||||
catProtocol.sendRaw(command)
|
||||
}
|
||||
|
||||
func clearCommandHistory() {
|
||||
catProtocol.clearCommandHistory()
|
||||
}
|
||||
|
||||
// MARK: - Helpers
|
||||
|
||||
func formatFrequency(_ freq: Int) -> String {
|
||||
let mhz = freq / 1_000_000
|
||||
let khz = (freq % 1_000_000) / 1_000
|
||||
let hz = freq % 1_000
|
||||
return String(format: "%d.%03d.%03d", mhz, khz, hz)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,172 @@
|
||||
//
|
||||
// SettingsController.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Application settings controller
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Settings Controller
|
||||
|
||||
@MainActor
|
||||
class SettingsController: ObservableObject {
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
// UI Settings
|
||||
@Published var uiStyle: UIStyle = .modern {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var language: AppLanguage = .german {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var compactMode: Bool = true {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var showDebugPanel: Bool = false {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var showLogPanel: Bool = false {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
// Connection Settings
|
||||
@Published var autoReconnect: Bool = true {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var reconnectInterval: TimeInterval = 5.0 {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var defaultBaudRate: Int = 38400 {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
// Frequency Settings
|
||||
@Published var frequencyStep: FrequencyStep = .khz1 {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
// Logging Settings
|
||||
@Published var logDirectory: String = "~/Documents/FT991A-Logs/" {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var autoSaveLog: Bool = true {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
// Audio Settings
|
||||
@Published var audioInputDevice: String = "" {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var audioOutputDevice: String = "" {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var useBlackHole: Bool = false {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
// Keyboard Settings
|
||||
@Published var pttShortcutEnabled: Bool = true {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var arrowFrequencyEnabled: Bool = true {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
@Published var tunerShortcutEnabled: Bool = true {
|
||||
didSet { saveSettings() }
|
||||
}
|
||||
|
||||
// MARK: - Private Properties
|
||||
|
||||
private var settings: AppSettings
|
||||
private var saveDebounce: Timer?
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
settings = AppSettings.load()
|
||||
loadFromSettings()
|
||||
}
|
||||
|
||||
// MARK: - Settings Management
|
||||
|
||||
private func loadFromSettings() {
|
||||
uiStyle = settings.uiStyle
|
||||
language = settings.language
|
||||
compactMode = settings.compactMode
|
||||
showDebugPanel = settings.showDebugPanel
|
||||
showLogPanel = settings.showLogPanel
|
||||
autoReconnect = settings.autoReconnect
|
||||
reconnectInterval = settings.reconnectInterval
|
||||
frequencyStep = settings.frequencyStep
|
||||
logDirectory = settings.logDirectory
|
||||
autoSaveLog = settings.autoSaveLog
|
||||
audioInputDevice = settings.audioInputDevice
|
||||
audioOutputDevice = settings.audioOutputDevice
|
||||
useBlackHole = settings.useBlackHole
|
||||
pttShortcutEnabled = settings.pttShortcutEnabled
|
||||
arrowFrequencyEnabled = settings.arrowFrequencyEnabled
|
||||
tunerShortcutEnabled = settings.tunerShortcutEnabled
|
||||
defaultBaudRate = settings.baudRate
|
||||
}
|
||||
|
||||
private func saveSettings() {
|
||||
// Debounce saves to avoid excessive disk writes
|
||||
saveDebounce?.invalidate()
|
||||
saveDebounce = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { [weak self] _ in
|
||||
self?.performSave()
|
||||
}
|
||||
}
|
||||
|
||||
private func performSave() {
|
||||
settings.uiStyle = uiStyle
|
||||
settings.language = language
|
||||
settings.compactMode = compactMode
|
||||
settings.showDebugPanel = showDebugPanel
|
||||
settings.showLogPanel = showLogPanel
|
||||
settings.autoReconnect = autoReconnect
|
||||
settings.reconnectInterval = reconnectInterval
|
||||
settings.frequencyStep = frequencyStep
|
||||
settings.logDirectory = logDirectory
|
||||
settings.autoSaveLog = autoSaveLog
|
||||
settings.audioInputDevice = audioInputDevice
|
||||
settings.audioOutputDevice = audioOutputDevice
|
||||
settings.useBlackHole = useBlackHole
|
||||
settings.pttShortcutEnabled = pttShortcutEnabled
|
||||
settings.arrowFrequencyEnabled = arrowFrequencyEnabled
|
||||
settings.tunerShortcutEnabled = tunerShortcutEnabled
|
||||
settings.baudRate = defaultBaudRate
|
||||
|
||||
settings.save()
|
||||
Logger.shared.log("Settings saved", level: .debug)
|
||||
}
|
||||
|
||||
func resetToDefaults() {
|
||||
settings = AppSettings.defaults
|
||||
loadFromSettings()
|
||||
settings.save()
|
||||
Logger.shared.log("Settings reset to defaults", level: .info)
|
||||
}
|
||||
|
||||
// MARK: - Helpers
|
||||
|
||||
var expandedLogDirectory: String {
|
||||
(logDirectory as NSString).expandingTildeInPath
|
||||
}
|
||||
|
||||
static let availableBaudRates = [4800, 9600, 19200, 38400, 57600, 115200]
|
||||
}
|
||||
@@ -0,0 +1,216 @@
|
||||
//
|
||||
// MainView.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Main application window container
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Main View
|
||||
|
||||
struct MainView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
@EnvironmentObject var logViewModel: LogViewModel
|
||||
|
||||
@State private var isDebugPanelDetached = false
|
||||
@State private var isLogPanelDetached = false
|
||||
|
||||
var body: some View {
|
||||
NavigationSplitView {
|
||||
// Sidebar
|
||||
SidebarView()
|
||||
.frame(minWidth: 200)
|
||||
} detail: {
|
||||
// Main content
|
||||
HSplitView {
|
||||
// Radio control area
|
||||
VStack(spacing: 0) {
|
||||
// Connection bar
|
||||
ConnectionBar()
|
||||
.padding(.horizontal)
|
||||
.padding(.top, 8)
|
||||
|
||||
Divider()
|
||||
.padding(.top, 8)
|
||||
|
||||
// Radio view based on UI style
|
||||
if settingsController.uiStyle == .modern {
|
||||
ModernRadioView()
|
||||
} else {
|
||||
SkeuomorphRadioView()
|
||||
}
|
||||
}
|
||||
.frame(minWidth: 600)
|
||||
|
||||
// Side panels
|
||||
if settingsController.showLogPanel && !isLogPanelDetached {
|
||||
Divider()
|
||||
LogPanel()
|
||||
.frame(minWidth: 300, maxWidth: 400)
|
||||
}
|
||||
|
||||
if settingsController.showDebugPanel && !isDebugPanelDetached {
|
||||
Divider()
|
||||
DebugPanel()
|
||||
.frame(minWidth: 300, maxWidth: 400)
|
||||
}
|
||||
}
|
||||
}
|
||||
.toolbar {
|
||||
ToolbarItemGroup(placement: .primaryAction) {
|
||||
// UI Style toggle
|
||||
Picker("UI", selection: $settingsController.uiStyle) {
|
||||
Image(systemName: "rectangle.3.group")
|
||||
.tag(UIStyle.modern)
|
||||
Image(systemName: "dial.medium")
|
||||
.tag(UIStyle.skeuomorph)
|
||||
}
|
||||
.pickerStyle(.segmented)
|
||||
.help("UI-Stil wechseln")
|
||||
|
||||
Divider()
|
||||
|
||||
// Panel toggles
|
||||
Toggle(isOn: $settingsController.showLogPanel) {
|
||||
Image(systemName: "list.bullet.rectangle")
|
||||
}
|
||||
.help("Log-Panel anzeigen")
|
||||
|
||||
Toggle(isOn: $settingsController.showDebugPanel) {
|
||||
Image(systemName: "terminal")
|
||||
}
|
||||
.help("Debug-Panel anzeigen")
|
||||
}
|
||||
}
|
||||
.navigationTitle("FT-991A Remote")
|
||||
.onAppear {
|
||||
setupKeyboardShortcuts()
|
||||
}
|
||||
}
|
||||
|
||||
private func setupKeyboardShortcuts() {
|
||||
// Keyboard shortcuts are handled in the App commands
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Sidebar View
|
||||
|
||||
struct SidebarView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
List {
|
||||
Section("Verbindung") {
|
||||
Label {
|
||||
VStack(alignment: .leading) {
|
||||
Text(radioViewModel.isConnected ? "Verbunden" : "Getrennt")
|
||||
.font(.headline)
|
||||
if radioViewModel.isConnected {
|
||||
Text(radioViewModel.selectedPort)
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
} icon: {
|
||||
Image(systemName: radioViewModel.isConnected ? "antenna.radiowaves.left.and.right" : "antenna.radiowaves.left.and.right.slash")
|
||||
.foregroundColor(radioViewModel.isConnected ? .green : .red)
|
||||
}
|
||||
}
|
||||
|
||||
Section("Frequenz") {
|
||||
Label {
|
||||
Text(radioViewModel.frequencyDisplay + " Hz")
|
||||
.font(.system(.body, design: .monospaced))
|
||||
} icon: {
|
||||
Image(systemName: "waveform")
|
||||
}
|
||||
|
||||
if let band = radioViewModel.currentBand {
|
||||
Label(band.rawValue, systemImage: "chart.bar")
|
||||
}
|
||||
|
||||
Label(radioViewModel.mode.rawValue, systemImage: "waveform.path")
|
||||
}
|
||||
|
||||
Section("Bänder") {
|
||||
ForEach(Band.allCases, id: \.self) { band in
|
||||
Button {
|
||||
radioViewModel.selectBand(band)
|
||||
} label: {
|
||||
Label(band.rawValue, systemImage: "antenna.radiowaves.left.and.right")
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
}
|
||||
}
|
||||
.listStyle(.sidebar)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Connection Bar
|
||||
|
||||
struct ConnectionBar: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 12) {
|
||||
// Port selection
|
||||
Picker("Port", selection: $radioViewModel.selectedPort) {
|
||||
Text("Port wählen...").tag("")
|
||||
ForEach(radioViewModel.availablePorts) { port in
|
||||
Text(port.name).tag(port.path)
|
||||
}
|
||||
}
|
||||
.frame(width: 200)
|
||||
|
||||
// Refresh button
|
||||
Button {
|
||||
radioViewModel.refreshPorts()
|
||||
} label: {
|
||||
Image(systemName: "arrow.clockwise")
|
||||
}
|
||||
.help("Ports aktualisieren")
|
||||
|
||||
// Baud rate
|
||||
Picker("Baud", selection: $radioViewModel.baudRate) {
|
||||
ForEach(SerialConfig.availableBaudRates, id: \.self) { rate in
|
||||
Text("\(rate)").tag(rate)
|
||||
}
|
||||
}
|
||||
.frame(width: 100)
|
||||
|
||||
Spacer()
|
||||
|
||||
// Connection status
|
||||
HStack(spacing: 6) {
|
||||
Circle()
|
||||
.fill(radioViewModel.isConnected ? Color.green : Color.red)
|
||||
.frame(width: 10, height: 10)
|
||||
|
||||
Text(radioViewModel.connectionState.displayString)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
// Connect button
|
||||
Button {
|
||||
radioViewModel.toggleConnection()
|
||||
} label: {
|
||||
Text(radioViewModel.isConnected ? "Trennen" : "Verbinden")
|
||||
}
|
||||
.keyboardShortcut("k", modifiers: .command)
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
MainView()
|
||||
.environmentObject(RadioViewModel())
|
||||
.environmentObject(SettingsController())
|
||||
.environmentObject(LogViewModel())
|
||||
.frame(width: 1200, height: 800)
|
||||
}
|
||||
@@ -0,0 +1,134 @@
|
||||
//
|
||||
// MenuBarView.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Menu bar extra for background operation
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Menu Bar View
|
||||
|
||||
struct MenuBarView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
// Connection status
|
||||
HStack {
|
||||
Circle()
|
||||
.fill(radioViewModel.isConnected ? Color.green : Color.red)
|
||||
.frame(width: 10, height: 10)
|
||||
|
||||
Text(radioViewModel.isConnected ? "Verbunden" : "Getrennt")
|
||||
.font(.headline)
|
||||
|
||||
Spacer()
|
||||
|
||||
Button(radioViewModel.isConnected ? "Trennen" : "Verbinden") {
|
||||
radioViewModel.toggleConnection()
|
||||
}
|
||||
.controlSize(.small)
|
||||
}
|
||||
|
||||
if radioViewModel.isConnected {
|
||||
Divider()
|
||||
|
||||
// Frequency display
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("Frequenz")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Text(radioViewModel.frequencyDisplay + " Hz")
|
||||
.font(.system(.title3, design: .monospaced))
|
||||
}
|
||||
|
||||
// Mode and Band
|
||||
HStack {
|
||||
Text(radioViewModel.mode.rawValue)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 2)
|
||||
.background(Color.accentColor.opacity(0.2))
|
||||
.cornerRadius(4)
|
||||
|
||||
if let band = radioViewModel.currentBand {
|
||||
Text(band.rawValue)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
Text(radioViewModel.sMeterDisplay)
|
||||
.font(.caption.monospacedDigit())
|
||||
}
|
||||
|
||||
// TX Status
|
||||
if radioViewModel.isTransmitting {
|
||||
HStack {
|
||||
Circle()
|
||||
.fill(Color.red)
|
||||
.frame(width: 10, height: 10)
|
||||
Text("Senden")
|
||||
.foregroundColor(.red)
|
||||
}
|
||||
}
|
||||
|
||||
Divider()
|
||||
|
||||
// Quick controls
|
||||
HStack(spacing: 12) {
|
||||
Button {
|
||||
radioViewModel.selectVFO(radioViewModel.activeVFO == .a ? .b : .a)
|
||||
} label: {
|
||||
Text("VFO \(radioViewModel.activeVFO.rawValue)")
|
||||
}
|
||||
.controlSize(.small)
|
||||
|
||||
Button("A/B") {
|
||||
radioViewModel.swapVFO()
|
||||
}
|
||||
.controlSize(.small)
|
||||
|
||||
Button("ATU") {
|
||||
radioViewModel.startATUTune()
|
||||
}
|
||||
.controlSize(.small)
|
||||
}
|
||||
}
|
||||
|
||||
Divider()
|
||||
|
||||
// App controls
|
||||
Button("Hauptfenster öffnen") {
|
||||
NSApp.activate(ignoringOtherApps: true)
|
||||
if let window = NSApp.windows.first {
|
||||
window.makeKeyAndOrderFront(nil)
|
||||
}
|
||||
}
|
||||
|
||||
Button("Einstellungen...") {
|
||||
NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
|
||||
}
|
||||
.keyboardShortcut(",", modifiers: .command)
|
||||
|
||||
Divider()
|
||||
|
||||
Button("Beenden") {
|
||||
NSApp.terminate(nil)
|
||||
}
|
||||
.keyboardShortcut("q", modifiers: .command)
|
||||
}
|
||||
.padding()
|
||||
.frame(width: 280)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
MenuBarView()
|
||||
.environmentObject(RadioViewModel())
|
||||
.environmentObject(SettingsController())
|
||||
}
|
||||
@@ -0,0 +1,576 @@
|
||||
//
|
||||
// ModernRadioView.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Modern UI style for radio control
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Modern Radio View
|
||||
|
||||
struct ModernRadioView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
VStack(spacing: 20) {
|
||||
// Frequency Section
|
||||
FrequencyView()
|
||||
|
||||
// Mode & Filter Section
|
||||
HStack(spacing: 20) {
|
||||
ModeView()
|
||||
Spacer()
|
||||
LevelView()
|
||||
}
|
||||
|
||||
// Functions Section
|
||||
FunctionsView()
|
||||
|
||||
// Metering Section
|
||||
MeteringView()
|
||||
|
||||
// PTT Section
|
||||
PTTButton()
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Frequency View
|
||||
|
||||
struct FrequencyView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
@State private var frequencyInput = ""
|
||||
@State private var isEditing = false
|
||||
|
||||
var body: some View {
|
||||
GroupBox("Frequenz") {
|
||||
VStack(spacing: 16) {
|
||||
// VFO Selection
|
||||
HStack {
|
||||
// VFO A
|
||||
Button {
|
||||
radioViewModel.selectVFO(.a)
|
||||
} label: {
|
||||
HStack {
|
||||
Circle()
|
||||
.fill(radioViewModel.activeVFO == .a ? Color.green : Color.gray.opacity(0.3))
|
||||
.frame(width: 12, height: 12)
|
||||
Text("VFO-A")
|
||||
.font(.headline)
|
||||
Text(radioViewModel.formatFrequency(radioViewModel.vfoAFrequency))
|
||||
.font(.system(.body, design: .monospaced))
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 8)
|
||||
.background(radioViewModel.activeVFO == .a ? Color.accentColor.opacity(0.1) : Color.clear)
|
||||
.cornerRadius(8)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
// VFO controls
|
||||
HStack(spacing: 8) {
|
||||
Button("A/B") {
|
||||
radioViewModel.swapVFO()
|
||||
}
|
||||
.help("VFO A und B tauschen")
|
||||
|
||||
Button("A=B") {
|
||||
radioViewModel.equalizeVFO()
|
||||
}
|
||||
.help("VFO B auf A-Frequenz setzen")
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
// VFO B
|
||||
Button {
|
||||
radioViewModel.selectVFO(.b)
|
||||
} label: {
|
||||
HStack {
|
||||
Text(radioViewModel.formatFrequency(radioViewModel.vfoBFrequency))
|
||||
.font(.system(.body, design: .monospaced))
|
||||
.foregroundColor(.secondary)
|
||||
Text("VFO-B")
|
||||
.font(.headline)
|
||||
Circle()
|
||||
.fill(radioViewModel.activeVFO == .b ? Color.green : Color.gray.opacity(0.3))
|
||||
.frame(width: 12, height: 12)
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 8)
|
||||
.background(radioViewModel.activeVFO == .b ? Color.accentColor.opacity(0.1) : Color.clear)
|
||||
.cornerRadius(8)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
|
||||
// Main frequency display
|
||||
HStack {
|
||||
Button {
|
||||
radioViewModel.decrementFrequency()
|
||||
} label: {
|
||||
Image(systemName: "minus.circle.fill")
|
||||
.font(.title)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.keyboardShortcut(.leftArrow, modifiers: [])
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
// Frequency display
|
||||
VStack(spacing: 4) {
|
||||
Text(radioViewModel.frequencyDisplay)
|
||||
.font(.system(size: 48, weight: .bold, design: .monospaced))
|
||||
.foregroundColor(radioViewModel.isTransmitting ? .red : .primary)
|
||||
|
||||
Text("Hz")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
Button {
|
||||
radioViewModel.incrementFrequency()
|
||||
} label: {
|
||||
Image(systemName: "plus.circle.fill")
|
||||
.font(.title)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.keyboardShortcut(.rightArrow, modifiers: [])
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
|
||||
// Frequency step selector
|
||||
HStack {
|
||||
Text("Schritt:")
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Picker("Schritt", selection: $settingsController.frequencyStep) {
|
||||
ForEach(FrequencyStep.allCases, id: \.self) { step in
|
||||
Text(step.displayName).tag(step)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.segmented)
|
||||
.frame(maxWidth: 500)
|
||||
}
|
||||
|
||||
// Band buttons
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
HStack(spacing: 8) {
|
||||
ForEach(Band.allCases, id: \.self) { band in
|
||||
Button {
|
||||
radioViewModel.selectBand(band)
|
||||
} label: {
|
||||
Text(band.rawValue)
|
||||
.font(.caption)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 6)
|
||||
.background(radioViewModel.currentBand == band ? Color.accentColor : Color.secondary.opacity(0.2))
|
||||
.foregroundColor(radioViewModel.currentBand == band ? .white : .primary)
|
||||
.cornerRadius(6)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Mode View
|
||||
|
||||
struct ModeView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
let commonModes: [OperatingMode] = [.lsb, .usb, .cw, .fm, .am]
|
||||
let digitalModes: [OperatingMode] = [.dataLSB, .dataUSB, .rttyLSB, .rttyUSB, .c4fm]
|
||||
|
||||
var body: some View {
|
||||
GroupBox("Betriebsart") {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
// Common modes
|
||||
HStack(spacing: 8) {
|
||||
ForEach(commonModes, id: \.self) { mode in
|
||||
Button {
|
||||
radioViewModel.setMode(mode)
|
||||
} label: {
|
||||
Text(mode.rawValue)
|
||||
.font(.caption.bold())
|
||||
.frame(width: 50)
|
||||
.padding(.vertical, 6)
|
||||
.background(radioViewModel.mode == mode ? Color.accentColor : Color.secondary.opacity(0.2))
|
||||
.foregroundColor(radioViewModel.mode == mode ? .white : .primary)
|
||||
.cornerRadius(6)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
}
|
||||
|
||||
// Digital modes
|
||||
HStack(spacing: 8) {
|
||||
ForEach(digitalModes, id: \.self) { mode in
|
||||
Button {
|
||||
radioViewModel.setMode(mode)
|
||||
} label: {
|
||||
Text(mode.rawValue)
|
||||
.font(.caption.bold())
|
||||
.frame(minWidth: 50)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 6)
|
||||
.background(radioViewModel.mode == mode ? Color.orange : Color.secondary.opacity(0.2))
|
||||
.foregroundColor(radioViewModel.mode == mode ? .white : .primary)
|
||||
.cornerRadius(6)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Level View
|
||||
|
||||
struct LevelView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
GroupBox("Pegel") {
|
||||
VStack(spacing: 12) {
|
||||
LevelSlider(label: "AF", value: Binding(
|
||||
get: { Double(radioViewModel.afGain) },
|
||||
set: { radioViewModel.setAFGain(Int($0)) }
|
||||
), range: 0...255, disabled: !radioViewModel.isConnected)
|
||||
|
||||
LevelSlider(label: "RF", value: Binding(
|
||||
get: { Double(radioViewModel.rfGain) },
|
||||
set: { radioViewModel.setRFGain(Int($0)) }
|
||||
), range: 0...255, disabled: !radioViewModel.isConnected)
|
||||
|
||||
LevelSlider(label: "SQL", value: Binding(
|
||||
get: { Double(radioViewModel.squelch) },
|
||||
set: { radioViewModel.setSquelch(Int($0)) }
|
||||
), range: 0...255, disabled: !radioViewModel.isConnected)
|
||||
|
||||
LevelSlider(label: "MIC", value: Binding(
|
||||
get: { Double(radioViewModel.micGain) },
|
||||
set: { radioViewModel.setMICGain(Int($0)) }
|
||||
), range: 0...100, disabled: !radioViewModel.isConnected)
|
||||
|
||||
LevelSlider(label: "PWR", value: Binding(
|
||||
get: { Double(radioViewModel.power) },
|
||||
set: { radioViewModel.setPower(Int($0)) }
|
||||
), range: 5...100, unit: "W", disabled: !radioViewModel.isConnected)
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
.frame(width: 300)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Level Slider
|
||||
|
||||
struct LevelSlider: View {
|
||||
let label: String
|
||||
@Binding var value: Double
|
||||
let range: ClosedRange<Double>
|
||||
var unit: String = "%"
|
||||
var disabled: Bool = false
|
||||
|
||||
var displayValue: String {
|
||||
if unit == "W" {
|
||||
return "\(Int(value))W"
|
||||
} else {
|
||||
let percent = (value - range.lowerBound) / (range.upperBound - range.lowerBound) * 100
|
||||
return "\(Int(percent))%"
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Text(label)
|
||||
.font(.caption.bold())
|
||||
.frame(width: 35, alignment: .leading)
|
||||
|
||||
Slider(value: $value, in: range)
|
||||
.disabled(disabled)
|
||||
|
||||
Text(displayValue)
|
||||
.font(.caption.monospacedDigit())
|
||||
.frame(width: 45, alignment: .trailing)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Functions View
|
||||
|
||||
struct FunctionsView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
GroupBox("Funktionen") {
|
||||
HStack(spacing: 12) {
|
||||
FunctionButton(label: "NB", isActive: radioViewModel.noiseBlanker) {
|
||||
radioViewModel.toggleNB()
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
FunctionButton(label: "NR", isActive: radioViewModel.noiseReduction) {
|
||||
radioViewModel.toggleNR()
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
FunctionButton(label: "DNF", isActive: radioViewModel.dnf) {
|
||||
radioViewModel.toggleDNF()
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
FunctionButton(label: "CONT", isActive: radioViewModel.contour) {
|
||||
// Toggle contour
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Divider()
|
||||
.frame(height: 30)
|
||||
|
||||
FunctionButton(label: "ATU", isActive: radioViewModel.atu, color: .orange) {
|
||||
radioViewModel.startATUTune()
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
.keyboardShortcut(.upArrow, modifiers: [])
|
||||
|
||||
FunctionButton(label: "SPLIT", isActive: radioViewModel.split) {
|
||||
radioViewModel.toggleSplit()
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
FunctionButton(label: "IPO", isActive: radioViewModel.ipo) {
|
||||
// Toggle IPO
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Function Button
|
||||
|
||||
struct FunctionButton: View {
|
||||
let label: String
|
||||
let isActive: Bool
|
||||
var color: Color = .accentColor
|
||||
let action: () -> Void
|
||||
|
||||
var body: some View {
|
||||
Button(action: action) {
|
||||
Text(label)
|
||||
.font(.caption.bold())
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 8)
|
||||
.background(isActive ? color : Color.secondary.opacity(0.2))
|
||||
.foregroundColor(isActive ? .white : .primary)
|
||||
.cornerRadius(6)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Metering View
|
||||
|
||||
struct MeteringView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
GroupBox("Messwerte") {
|
||||
VStack(spacing: 16) {
|
||||
// S-Meter
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
HStack {
|
||||
Text("S-Meter")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
Spacer()
|
||||
Text(radioViewModel.sMeterDisplay)
|
||||
.font(.caption.bold().monospacedDigit())
|
||||
}
|
||||
|
||||
SMeterBar(value: Double(radioViewModel.sMeter) / 255.0)
|
||||
}
|
||||
|
||||
// Power meter (only shown when transmitting)
|
||||
if radioViewModel.isTransmitting {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
HStack {
|
||||
Text("Leistung")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
Spacer()
|
||||
Text("\(radioViewModel.powerMeter)W")
|
||||
.font(.caption.bold().monospacedDigit())
|
||||
}
|
||||
|
||||
MeterBar(value: Double(radioViewModel.powerMeter) / 100.0, color: .orange)
|
||||
}
|
||||
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
HStack {
|
||||
Text("SWR")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
Spacer()
|
||||
Text(String(format: "%.1f:1", 1.0 + Double(radioViewModel.swrMeter) / 50.0))
|
||||
.font(.caption.bold().monospacedDigit())
|
||||
}
|
||||
|
||||
MeterBar(value: Double(radioViewModel.swrMeter) / 255.0, color: radioViewModel.swrMeter > 100 ? .red : .green)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - S-Meter Bar
|
||||
|
||||
struct SMeterBar: View {
|
||||
let value: Double
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
ZStack(alignment: .leading) {
|
||||
// Background
|
||||
RoundedRectangle(cornerRadius: 4)
|
||||
.fill(Color.secondary.opacity(0.2))
|
||||
|
||||
// S-Unit markers
|
||||
HStack(spacing: 0) {
|
||||
ForEach(0..<10) { i in
|
||||
Rectangle()
|
||||
.fill(Color.secondary.opacity(0.3))
|
||||
.frame(width: 1)
|
||||
if i < 9 {
|
||||
Spacer()
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 2)
|
||||
|
||||
// Value bar
|
||||
RoundedRectangle(cornerRadius: 4)
|
||||
.fill(
|
||||
LinearGradient(
|
||||
colors: [.green, .yellow, .orange, .red],
|
||||
startPoint: .leading,
|
||||
endPoint: .trailing
|
||||
)
|
||||
)
|
||||
.frame(width: max(0, geometry.size.width * value))
|
||||
}
|
||||
}
|
||||
.frame(height: 20)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Meter Bar
|
||||
|
||||
struct MeterBar: View {
|
||||
let value: Double
|
||||
var color: Color = .green
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
ZStack(alignment: .leading) {
|
||||
RoundedRectangle(cornerRadius: 4)
|
||||
.fill(Color.secondary.opacity(0.2))
|
||||
|
||||
RoundedRectangle(cornerRadius: 4)
|
||||
.fill(color)
|
||||
.frame(width: max(0, geometry.size.width * min(1, value)))
|
||||
}
|
||||
}
|
||||
.frame(height: 16)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - PTT Button
|
||||
|
||||
struct PTTButton: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
@State private var isPressed = false
|
||||
|
||||
var body: some View {
|
||||
GroupBox("PTT") {
|
||||
VStack(spacing: 12) {
|
||||
Button {
|
||||
radioViewModel.toggleTransmit()
|
||||
} label: {
|
||||
HStack {
|
||||
Image(systemName: radioViewModel.isTransmitting ? "mic.fill" : "mic")
|
||||
Text(radioViewModel.isTransmitting ? "EMPFANG" : "SENDEN")
|
||||
.font(.headline)
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 16)
|
||||
.background(radioViewModel.isTransmitting ? Color.red : Color.accentColor)
|
||||
.foregroundColor(.white)
|
||||
.cornerRadius(8)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Text("Shift-Taste gedrückt halten = PTT")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
// TX indicator
|
||||
HStack {
|
||||
Circle()
|
||||
.fill(radioViewModel.isTransmitting ? Color.red : Color.gray.opacity(0.3))
|
||||
.frame(width: 16, height: 16)
|
||||
Text(radioViewModel.isTransmitting ? "TX" : "RX")
|
||||
.font(.caption.bold())
|
||||
.foregroundColor(radioViewModel.isTransmitting ? .red : .green)
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
ModernRadioView()
|
||||
.environmentObject(RadioViewModel())
|
||||
.environmentObject(SettingsController())
|
||||
.frame(width: 800, height: 900)
|
||||
.padding()
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
//
|
||||
// AudioPanel.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// BlackHole audio routing panel
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Audio Panel
|
||||
|
||||
struct AudioPanel: View {
|
||||
@StateObject private var audioRouter = AudioRouter()
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
// Header
|
||||
HStack {
|
||||
Text("Audio Routing")
|
||||
.font(.headline)
|
||||
|
||||
Spacer()
|
||||
|
||||
Button {
|
||||
audioRouter.refreshDevices()
|
||||
} label: {
|
||||
Image(systemName: "arrow.clockwise")
|
||||
}
|
||||
.help("Geräte aktualisieren")
|
||||
}
|
||||
.padding(.horizontal)
|
||||
.padding(.vertical, 8)
|
||||
.background(Color.secondary.opacity(0.1))
|
||||
|
||||
Divider()
|
||||
|
||||
ScrollView {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
// BlackHole Status
|
||||
GroupBox("BlackHole Status") {
|
||||
HStack {
|
||||
Circle()
|
||||
.fill(audioRouter.isBlackHoleInstalled ? Color.green : Color.red)
|
||||
.frame(width: 12, height: 12)
|
||||
|
||||
Text(audioRouter.isBlackHoleInstalled ? "Installiert" : "Nicht gefunden")
|
||||
|
||||
Spacer()
|
||||
|
||||
if !audioRouter.isBlackHoleInstalled {
|
||||
Link("Installieren", destination: URL(string: "https://existential.audio/blackhole/")!)
|
||||
.font(.caption)
|
||||
}
|
||||
}
|
||||
.padding(.vertical, 4)
|
||||
|
||||
if let device = audioRouter.blackHoleDevice {
|
||||
Text("Gerät: \(device.name)")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
|
||||
// Input Device
|
||||
GroupBox("Eingang (RX Audio)") {
|
||||
Picker("Eingabegerät", selection: $audioRouter.selectedInputDevice) {
|
||||
Text("Keines").tag(nil as AudioDeviceID?)
|
||||
ForEach(audioRouter.inputDevices) { device in
|
||||
Text(device.displayName).tag(device.id as AudioDeviceID?)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.menu)
|
||||
|
||||
if let ft991a = audioRouter.ft991aDevice {
|
||||
HStack {
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.foregroundColor(.green)
|
||||
Text("FT-991A erkannt: \(ft991a.name)")
|
||||
.font(.caption)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Output Device
|
||||
GroupBox("Ausgang (TX Audio)") {
|
||||
Picker("Ausgabegerät", selection: $audioRouter.selectedOutputDevice) {
|
||||
Text("Keines").tag(nil as AudioDeviceID?)
|
||||
ForEach(audioRouter.outputDevices) { device in
|
||||
Text(device.displayName).tag(device.id as AudioDeviceID?)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.menu)
|
||||
}
|
||||
|
||||
// Digital Mode Configuration
|
||||
GroupBox("Digitale Betriebsarten") {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("Für FT8, WSPR, RTTY und andere digitale Modi:")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Button("Für Digimodes konfigurieren") {
|
||||
_ = audioRouter.configureForDigitalModes()
|
||||
}
|
||||
.disabled(!audioRouter.isBlackHoleInstalled)
|
||||
|
||||
Toggle("BlackHole verwenden", isOn: $settingsController.useBlackHole)
|
||||
.disabled(!audioRouter.isBlackHoleInstalled)
|
||||
}
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
|
||||
// Routing Diagram
|
||||
GroupBox("Routing-Schema") {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("FT-991A USB Audio → BlackHole → WSJT-X/fldigi")
|
||||
.font(.caption.monospaced())
|
||||
Text("WSJT-X/fldigi → BlackHole → FT-991A USB Audio")
|
||||
.font(.caption.monospaced())
|
||||
}
|
||||
.foregroundColor(.secondary)
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
|
||||
// Error display
|
||||
if let error = audioRouter.lastError {
|
||||
HStack {
|
||||
Image(systemName: "exclamationmark.triangle")
|
||||
.foregroundColor(.orange)
|
||||
Text(error)
|
||||
.font(.caption)
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
AudioPanel()
|
||||
.environmentObject(SettingsController())
|
||||
.frame(width: 350, height: 500)
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
//
|
||||
// DebugPanel.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// CAT command console for debugging
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Debug Panel
|
||||
|
||||
struct DebugPanel: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
@State private var commandInput = ""
|
||||
@State private var autoScroll = true
|
||||
@State private var showOnlySent = false
|
||||
@State private var showOnlyReceived = false
|
||||
|
||||
var filteredHistory: [CommandLogEntry] {
|
||||
radioViewModel.commandHistory.filter { entry in
|
||||
if showOnlySent && entry.direction != .sent { return false }
|
||||
if showOnlyReceived && entry.direction != .received { return false }
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
// Header
|
||||
HStack {
|
||||
Text("CAT Konsole")
|
||||
.font(.headline)
|
||||
|
||||
Spacer()
|
||||
|
||||
// Filter buttons
|
||||
Toggle("TX", isOn: Binding(
|
||||
get: { showOnlySent },
|
||||
set: { showOnlySent = $0; if $0 { showOnlyReceived = false } }
|
||||
))
|
||||
.toggleStyle(.button)
|
||||
.controlSize(.small)
|
||||
|
||||
Toggle("RX", isOn: Binding(
|
||||
get: { showOnlyReceived },
|
||||
set: { showOnlyReceived = $0; if $0 { showOnlySent = false } }
|
||||
))
|
||||
.toggleStyle(.button)
|
||||
.controlSize(.small)
|
||||
|
||||
Toggle(isOn: $autoScroll) {
|
||||
Image(systemName: "arrow.down.to.line")
|
||||
}
|
||||
.toggleStyle(.button)
|
||||
.controlSize(.small)
|
||||
.help("Auto-Scroll")
|
||||
|
||||
Button {
|
||||
radioViewModel.clearCommandHistory()
|
||||
} label: {
|
||||
Image(systemName: "trash")
|
||||
}
|
||||
.controlSize(.small)
|
||||
.help("Verlauf löschen")
|
||||
}
|
||||
.padding(.horizontal)
|
||||
.padding(.vertical, 8)
|
||||
.background(Color.secondary.opacity(0.1))
|
||||
|
||||
Divider()
|
||||
|
||||
// Command history
|
||||
ScrollViewReader { proxy in
|
||||
ScrollView {
|
||||
LazyVStack(alignment: .leading, spacing: 2) {
|
||||
ForEach(filteredHistory) { entry in
|
||||
CommandLogRow(entry: entry)
|
||||
.id(entry.id)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
.font(.system(size: 11, design: .monospaced))
|
||||
.onChange(of: radioViewModel.commandHistory.count) { _, _ in
|
||||
if autoScroll, let last = filteredHistory.last {
|
||||
withAnimation {
|
||||
proxy.scrollTo(last.id, anchor: .bottom)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Divider()
|
||||
|
||||
// Command input
|
||||
HStack {
|
||||
TextField("CAT-Befehl eingeben (z.B. FA;)", text: $commandInput)
|
||||
.textFieldStyle(.plain)
|
||||
.font(.system(size: 12, design: .monospaced))
|
||||
.onSubmit {
|
||||
sendCommand()
|
||||
}
|
||||
|
||||
Button("Senden") {
|
||||
sendCommand()
|
||||
}
|
||||
.disabled(commandInput.isEmpty || !radioViewModel.isConnected)
|
||||
.keyboardShortcut(.return, modifiers: [])
|
||||
}
|
||||
.padding(8)
|
||||
.background(Color.secondary.opacity(0.1))
|
||||
|
||||
// Statistics
|
||||
HStack {
|
||||
Text("TX: \(radioViewModel.bytesSent) Bytes")
|
||||
Spacer()
|
||||
Text("RX: \(radioViewModel.bytesReceived) Bytes")
|
||||
Spacer()
|
||||
Text("\(radioViewModel.commandHistory.count) Befehle")
|
||||
}
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
.padding(.horizontal, 8)
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
}
|
||||
|
||||
private func sendCommand() {
|
||||
guard !commandInput.isEmpty else { return }
|
||||
|
||||
var cmd = commandInput.trimmingCharacters(in: .whitespaces)
|
||||
if !cmd.hasSuffix(";") {
|
||||
cmd += ";"
|
||||
}
|
||||
|
||||
radioViewModel.sendRawCommand(cmd)
|
||||
commandInput = ""
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Command Log Row
|
||||
|
||||
struct CommandLogRow: View {
|
||||
let entry: CommandLogEntry
|
||||
|
||||
var body: some View {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Text(entry.timeString)
|
||||
.foregroundColor(.secondary)
|
||||
.frame(width: 80, alignment: .leading)
|
||||
|
||||
Text(entry.direction.symbol)
|
||||
.foregroundColor(entry.direction == .sent ? .blue : .green)
|
||||
.frame(width: 15)
|
||||
|
||||
Text(entry.command)
|
||||
.foregroundColor(.primary)
|
||||
|
||||
if !entry.description.isEmpty {
|
||||
Text("// \(entry.description)")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.padding(.vertical, 1)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
DebugPanel()
|
||||
.environmentObject(RadioViewModel())
|
||||
.frame(width: 400, height: 500)
|
||||
}
|
||||
@@ -0,0 +1,318 @@
|
||||
//
|
||||
// LogPanel.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// QSO Log panel
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Log Panel
|
||||
|
||||
struct LogPanel: View {
|
||||
@EnvironmentObject var logViewModel: LogViewModel
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
@State private var isAddingQSO = false
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
// Header
|
||||
HStack {
|
||||
Text("QSO Log")
|
||||
.font(.headline)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("\(logViewModel.totalQSOs) QSOs")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Button {
|
||||
isAddingQSO = true
|
||||
} label: {
|
||||
Image(systemName: "plus")
|
||||
}
|
||||
.help("Neues QSO hinzufügen")
|
||||
}
|
||||
.padding(.horizontal)
|
||||
.padding(.vertical, 8)
|
||||
.background(Color.secondary.opacity(0.1))
|
||||
|
||||
Divider()
|
||||
|
||||
// Quick entry form
|
||||
if isAddingQSO {
|
||||
QuickLogEntry(isPresented: $isAddingQSO)
|
||||
Divider()
|
||||
}
|
||||
|
||||
// Search and filter
|
||||
HStack {
|
||||
Image(systemName: "magnifyingglass")
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
TextField("Suchen...", text: $logViewModel.searchText)
|
||||
.textFieldStyle(.plain)
|
||||
|
||||
if !logViewModel.searchText.isEmpty {
|
||||
Button {
|
||||
logViewModel.searchText = ""
|
||||
} label: {
|
||||
Image(systemName: "xmark.circle.fill")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
|
||||
Picker("Sortierung", selection: $logViewModel.sortOrder) {
|
||||
ForEach(LogViewModel.SortOrder.allCases, id: \.self) { order in
|
||||
Text(order.rawValue).tag(order)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.menu)
|
||||
.frame(width: 150)
|
||||
}
|
||||
.padding(.horizontal)
|
||||
.padding(.vertical, 6)
|
||||
|
||||
Divider()
|
||||
|
||||
// QSO List
|
||||
List {
|
||||
ForEach(logViewModel.filteredEntries) { entry in
|
||||
QSORow(entry: entry)
|
||||
.contextMenu {
|
||||
Button("Bearbeiten") {
|
||||
logViewModel.selectedEntry = entry
|
||||
}
|
||||
Button("Löschen", role: .destructive) {
|
||||
logViewModel.deleteQSO(entry)
|
||||
}
|
||||
}
|
||||
}
|
||||
.onDelete(perform: logViewModel.deleteQSOs)
|
||||
}
|
||||
.listStyle(.plain)
|
||||
|
||||
Divider()
|
||||
|
||||
// Footer with statistics
|
||||
HStack {
|
||||
Text("\(logViewModel.uniqueCallsigns) Stationen")
|
||||
|
||||
Spacer()
|
||||
|
||||
if let file = logViewModel.currentLogFile {
|
||||
Text(file.lastPathComponent)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.middle)
|
||||
}
|
||||
}
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
.padding(.horizontal)
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
.sheet(item: $logViewModel.selectedEntry) { entry in
|
||||
QSOEditSheet(entry: entry)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - QSO Row
|
||||
|
||||
struct QSORow: View {
|
||||
let entry: QSOEntry
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
HStack {
|
||||
Text(entry.callsign)
|
||||
.font(.headline)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text(entry.dateDisplay)
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Text(entry.timeDisplay)
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
HStack {
|
||||
Text(entry.frequencyDisplay)
|
||||
.font(.caption.monospacedDigit())
|
||||
|
||||
Text(entry.mode.rawValue)
|
||||
.font(.caption)
|
||||
.padding(.horizontal, 6)
|
||||
.padding(.vertical, 2)
|
||||
.background(Color.accentColor.opacity(0.2))
|
||||
.cornerRadius(4)
|
||||
|
||||
Text(entry.bandDisplay)
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("RST: \(entry.rstSent)/\(entry.rstReceived)")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
if !entry.name.isEmpty || !entry.qth.isEmpty {
|
||||
HStack {
|
||||
if !entry.name.isEmpty {
|
||||
Text(entry.name)
|
||||
.font(.caption)
|
||||
}
|
||||
if !entry.qth.isEmpty {
|
||||
Text("- \(entry.qth)")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Quick Log Entry
|
||||
|
||||
struct QuickLogEntry: View {
|
||||
@EnvironmentObject var logViewModel: LogViewModel
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
@Binding var isPresented: Bool
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 8) {
|
||||
HStack {
|
||||
TextField("Rufzeichen", text: $logViewModel.currentQSO.callsign)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
|
||||
TextField("RST TX", text: $logViewModel.currentQSO.rstSent)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
.frame(width: 50)
|
||||
|
||||
TextField("RST RX", text: $logViewModel.currentQSO.rstReceived)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
.frame(width: 50)
|
||||
}
|
||||
|
||||
HStack {
|
||||
TextField("Name", text: $logViewModel.currentQSO.name)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
|
||||
TextField("QTH", text: $logViewModel.currentQSO.qth)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
|
||||
TextField("Locator", text: $logViewModel.currentQSO.locator)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
.frame(width: 80)
|
||||
}
|
||||
|
||||
HStack {
|
||||
Button("Von Radio") {
|
||||
logViewModel.updateFromRadio(
|
||||
frequency: radioViewModel.activeFrequency,
|
||||
mode: radioViewModel.mode,
|
||||
power: radioViewModel.power
|
||||
)
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
Button("Abbrechen") {
|
||||
logViewModel.resetCurrentQSO()
|
||||
isPresented = false
|
||||
}
|
||||
|
||||
Button("Speichern") {
|
||||
logViewModel.addQSO()
|
||||
isPresented = false
|
||||
}
|
||||
.disabled(logViewModel.currentQSO.callsign.isEmpty)
|
||||
.keyboardShortcut(.return, modifiers: .command)
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
.background(Color.secondary.opacity(0.05))
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - QSO Edit Sheet
|
||||
|
||||
struct QSOEditSheet: View {
|
||||
@EnvironmentObject var logViewModel: LogViewModel
|
||||
@Environment(\.dismiss) var dismiss
|
||||
|
||||
let entry: QSOEntry
|
||||
@State private var editedEntry: QSOEntry
|
||||
|
||||
init(entry: QSOEntry) {
|
||||
self.entry = entry
|
||||
self._editedEntry = State(initialValue: entry)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 16) {
|
||||
Text("QSO bearbeiten")
|
||||
.font(.headline)
|
||||
|
||||
Form {
|
||||
TextField("Rufzeichen", text: $editedEntry.callsign)
|
||||
TextField("Name", text: $editedEntry.name)
|
||||
TextField("QTH", text: $editedEntry.qth)
|
||||
TextField("Locator", text: $editedEntry.locator)
|
||||
|
||||
HStack {
|
||||
TextField("RST TX", text: $editedEntry.rstSent)
|
||||
TextField("RST RX", text: $editedEntry.rstReceived)
|
||||
}
|
||||
|
||||
Picker("Mode", selection: $editedEntry.mode) {
|
||||
ForEach(OperatingMode.allCases, id: \.self) { mode in
|
||||
Text(mode.rawValue).tag(mode)
|
||||
}
|
||||
}
|
||||
|
||||
TextField("Notizen", text: $editedEntry.notes, axis: .vertical)
|
||||
.lineLimit(3...6)
|
||||
}
|
||||
.formStyle(.grouped)
|
||||
|
||||
HStack {
|
||||
Button("Abbrechen") {
|
||||
dismiss()
|
||||
}
|
||||
.keyboardShortcut(.escape, modifiers: [])
|
||||
|
||||
Spacer()
|
||||
|
||||
Button("Speichern") {
|
||||
logViewModel.updateQSO(editedEntry)
|
||||
dismiss()
|
||||
}
|
||||
.keyboardShortcut(.return, modifiers: .command)
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
.frame(width: 400, height: 400)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
LogPanel()
|
||||
.environmentObject(LogViewModel())
|
||||
.environmentObject(RadioViewModel())
|
||||
.frame(width: 350, height: 600)
|
||||
}
|
||||
@@ -0,0 +1,302 @@
|
||||
//
|
||||
// SettingsView.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Application settings view
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Settings View
|
||||
|
||||
struct SettingsView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
TabView {
|
||||
// Connection Settings
|
||||
ConnectionSettingsView()
|
||||
.tabItem {
|
||||
Label("Verbindung", systemImage: "cable.connector")
|
||||
}
|
||||
|
||||
// UI Settings
|
||||
UISettingsView()
|
||||
.tabItem {
|
||||
Label("Oberfläche", systemImage: "paintbrush")
|
||||
}
|
||||
|
||||
// Audio Settings
|
||||
AudioSettingsView()
|
||||
.tabItem {
|
||||
Label("Audio", systemImage: "speaker.wave.2")
|
||||
}
|
||||
|
||||
// Keyboard Settings
|
||||
KeyboardSettingsView()
|
||||
.tabItem {
|
||||
Label("Tastatur", systemImage: "keyboard")
|
||||
}
|
||||
|
||||
// Logging Settings
|
||||
LoggingSettingsView()
|
||||
.tabItem {
|
||||
Label("Logging", systemImage: "doc.text")
|
||||
}
|
||||
}
|
||||
.frame(width: 500, height: 400)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Connection Settings
|
||||
|
||||
struct ConnectionSettingsView: View {
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
Section("Serielle Verbindung") {
|
||||
Picker("Standard-Baudrate", selection: $settingsController.defaultBaudRate) {
|
||||
ForEach(SettingsController.availableBaudRates, id: \.self) { rate in
|
||||
Text("\(rate) baud").tag(rate)
|
||||
}
|
||||
}
|
||||
|
||||
Toggle("Auto-Reconnect aktivieren", isOn: $settingsController.autoReconnect)
|
||||
|
||||
if settingsController.autoReconnect {
|
||||
HStack {
|
||||
Text("Intervall:")
|
||||
Slider(value: $settingsController.reconnectInterval, in: 1...30, step: 1)
|
||||
Text("\(Int(settingsController.reconnectInterval))s")
|
||||
.frame(width: 30)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Section("FT-991A Einstellungen") {
|
||||
Text("Stelle sicher, dass im Radio-Menü folgende Einstellungen aktiv sind:")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("• CAT RATE: 38400 bps")
|
||||
Text("• CAT TOT: 100 ms")
|
||||
Text("• CAT RTS: OFF")
|
||||
}
|
||||
.font(.caption.monospaced())
|
||||
}
|
||||
}
|
||||
.formStyle(.grouped)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - UI Settings
|
||||
|
||||
struct UISettingsView: View {
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
Section("Erscheinungsbild") {
|
||||
Picker("UI-Stil", selection: $settingsController.uiStyle) {
|
||||
Text("Modern").tag(UIStyle.modern)
|
||||
Text("Frontpanel (Skeuomorph)").tag(UIStyle.skeuomorph)
|
||||
}
|
||||
|
||||
Toggle("Kompakter Modus", isOn: $settingsController.compactMode)
|
||||
}
|
||||
|
||||
Section("Sprache") {
|
||||
Picker("Sprache", selection: $settingsController.language) {
|
||||
ForEach(AppLanguage.allCases, id: \.self) { lang in
|
||||
Text(lang.displayName).tag(lang)
|
||||
}
|
||||
}
|
||||
|
||||
Text("Änderungen werden nach Neustart wirksam.")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Section("Frequenz") {
|
||||
Picker("Standard-Schrittweite", selection: $settingsController.frequencyStep) {
|
||||
ForEach(FrequencyStep.allCases, id: \.self) { step in
|
||||
Text(step.displayName).tag(step)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.formStyle(.grouped)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Audio Settings
|
||||
|
||||
struct AudioSettingsView: View {
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
@StateObject private var audioRouter = AudioRouter()
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
Section("Audio-Geräte") {
|
||||
Picker("Eingabegerät", selection: $settingsController.audioInputDevice) {
|
||||
Text("Standard").tag("")
|
||||
ForEach(audioRouter.inputDevices) { device in
|
||||
Text(device.name).tag(device.uid)
|
||||
}
|
||||
}
|
||||
|
||||
Picker("Ausgabegerät", selection: $settingsController.audioOutputDevice) {
|
||||
Text("Standard").tag("")
|
||||
ForEach(audioRouter.outputDevices) { device in
|
||||
Text(device.name).tag(device.uid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Section("BlackHole Integration") {
|
||||
HStack {
|
||||
Circle()
|
||||
.fill(audioRouter.isBlackHoleInstalled ? Color.green : Color.red)
|
||||
.frame(width: 10, height: 10)
|
||||
Text(audioRouter.isBlackHoleInstalled ? "BlackHole installiert" : "BlackHole nicht gefunden")
|
||||
}
|
||||
|
||||
Toggle("BlackHole für Digimodes verwenden", isOn: $settingsController.useBlackHole)
|
||||
.disabled(!audioRouter.isBlackHoleInstalled)
|
||||
|
||||
if !audioRouter.isBlackHoleInstalled {
|
||||
Link("BlackHole herunterladen", destination: URL(string: "https://existential.audio/blackhole/")!)
|
||||
}
|
||||
}
|
||||
}
|
||||
.formStyle(.grouped)
|
||||
.padding()
|
||||
.onAppear {
|
||||
audioRouter.refreshDevices()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Keyboard Settings
|
||||
|
||||
struct KeyboardSettingsView: View {
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
Section("Tastaturkürzel") {
|
||||
Toggle("Shift = PTT (Push-to-Talk)", isOn: $settingsController.pttShortcutEnabled)
|
||||
|
||||
Toggle("Pfeiltasten = Frequenz ändern", isOn: $settingsController.arrowFrequencyEnabled)
|
||||
|
||||
Toggle("Pfeil hoch = ATU Tune", isOn: $settingsController.tunerShortcutEnabled)
|
||||
}
|
||||
|
||||
Section("Übersicht") {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
KeyboardShortcutRow(key: "⌘K", action: "Verbinden/Trennen")
|
||||
KeyboardShortcutRow(key: "⇧⌘S", action: "VFO A/B tauschen")
|
||||
KeyboardShortcutRow(key: "⇧⌘E", action: "A=B")
|
||||
KeyboardShortcutRow(key: "⇧⌘T", action: "ATU Tune")
|
||||
KeyboardShortcutRow(key: "⌥⌘D", action: "Debug-Panel")
|
||||
KeyboardShortcutRow(key: "⌥⌘L", action: "Log-Panel")
|
||||
Divider()
|
||||
KeyboardShortcutRow(key: "←/→", action: "Frequenz +/-")
|
||||
KeyboardShortcutRow(key: "↑", action: "ATU Tune")
|
||||
KeyboardShortcutRow(key: "Shift", action: "PTT (halten)")
|
||||
}
|
||||
}
|
||||
}
|
||||
.formStyle(.grouped)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Keyboard Shortcut Row
|
||||
|
||||
struct KeyboardShortcutRow: View {
|
||||
let key: String
|
||||
let action: String
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Text(key)
|
||||
.font(.system(.caption, design: .monospaced))
|
||||
.padding(.horizontal, 6)
|
||||
.padding(.vertical, 2)
|
||||
.background(Color.secondary.opacity(0.2))
|
||||
.cornerRadius(4)
|
||||
.frame(width: 70, alignment: .leading)
|
||||
|
||||
Text(action)
|
||||
.font(.caption)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Logging Settings
|
||||
|
||||
struct LoggingSettingsView: View {
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
Section("Log-Speicherort") {
|
||||
HStack {
|
||||
TextField("Verzeichnis", text: $settingsController.logDirectory)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
|
||||
Button("Wählen...") {
|
||||
selectDirectory()
|
||||
}
|
||||
}
|
||||
|
||||
Text("Aktueller Pfad: \(settingsController.expandedLogDirectory)")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Section("Automatisches Speichern") {
|
||||
Toggle("Log automatisch speichern", isOn: $settingsController.autoSaveLog)
|
||||
|
||||
Text("Speichert QSOs automatisch nach jeder Eingabe.")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Section("CSV-Format") {
|
||||
Text("Felder: Call, Datum, Zeit, Frequenz, Mode, RST TX/RX, Name, QTH, Locator, Power, Notizen")
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
.formStyle(.grouped)
|
||||
.padding()
|
||||
}
|
||||
|
||||
private func selectDirectory() {
|
||||
let panel = NSOpenPanel()
|
||||
panel.canChooseFiles = false
|
||||
panel.canChooseDirectories = true
|
||||
panel.allowsMultipleSelection = false
|
||||
panel.canCreateDirectories = true
|
||||
panel.prompt = "Auswählen"
|
||||
|
||||
if panel.runModal() == .OK, let url = panel.url {
|
||||
settingsController.logDirectory = url.path
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
SettingsView()
|
||||
.environmentObject(RadioViewModel())
|
||||
.environmentObject(SettingsController())
|
||||
}
|
||||
@@ -0,0 +1,484 @@
|
||||
//
|
||||
// SkeuomorphRadioView.swift
|
||||
// FT991A-Remote
|
||||
//
|
||||
// Skeuomorphic FT-991A front panel replica
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// MARK: - Skeuomorph Radio View
|
||||
|
||||
struct SkeuomorphRadioView: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
// Background - dark metal texture
|
||||
LinearGradient(
|
||||
colors: [Color(white: 0.15), Color(white: 0.1)],
|
||||
startPoint: .top,
|
||||
endPoint: .bottom
|
||||
)
|
||||
.ignoresSafeArea()
|
||||
|
||||
VStack(spacing: 0) {
|
||||
// Top section - Display
|
||||
FrontPanelDisplay()
|
||||
.padding()
|
||||
|
||||
Divider()
|
||||
.background(Color.gray.opacity(0.3))
|
||||
|
||||
// Middle section - Main controls
|
||||
HStack(spacing: 30) {
|
||||
// Left side controls
|
||||
VStack(spacing: 20) {
|
||||
DialKnob(label: "AF GAIN", value: Binding(
|
||||
get: { Double(radioViewModel.afGain) / 255.0 },
|
||||
set: { radioViewModel.setAFGain(Int($0 * 255)) }
|
||||
))
|
||||
|
||||
DialKnob(label: "RF GAIN", value: Binding(
|
||||
get: { Double(radioViewModel.rfGain) / 255.0 },
|
||||
set: { radioViewModel.setRFGain(Int($0 * 255)) }
|
||||
))
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
// Center - Main VFO dial
|
||||
MainVFODial()
|
||||
|
||||
Spacer()
|
||||
|
||||
// Right side controls
|
||||
VStack(spacing: 20) {
|
||||
DialKnob(label: "SQL", value: Binding(
|
||||
get: { Double(radioViewModel.squelch) / 255.0 },
|
||||
set: { radioViewModel.setSquelch(Int($0 * 255)) }
|
||||
))
|
||||
|
||||
DialKnob(label: "MIC", value: Binding(
|
||||
get: { Double(radioViewModel.micGain) / 100.0 },
|
||||
set: { radioViewModel.setMICGain(Int($0 * 100)) }
|
||||
))
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
.padding(.horizontal, 40)
|
||||
.padding(.vertical, 20)
|
||||
|
||||
Divider()
|
||||
.background(Color.gray.opacity(0.3))
|
||||
|
||||
// Bottom section - Buttons
|
||||
FrontPanelButtons()
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Front Panel Display
|
||||
|
||||
struct FrontPanelDisplay: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
ZStack {
|
||||
// LCD background
|
||||
RoundedRectangle(cornerRadius: 8)
|
||||
.fill(
|
||||
LinearGradient(
|
||||
colors: [Color(red: 0.05, green: 0.15, blue: 0.1), Color(red: 0.02, green: 0.1, blue: 0.05)],
|
||||
startPoint: .top,
|
||||
endPoint: .bottom
|
||||
)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 8)
|
||||
.stroke(Color.gray.opacity(0.5), lineWidth: 2)
|
||||
)
|
||||
|
||||
VStack(spacing: 8) {
|
||||
// Top row - Status indicators
|
||||
HStack {
|
||||
LCDIndicator(label: "VFO-A", isActive: radioViewModel.activeVFO == .a)
|
||||
LCDIndicator(label: "VFO-B", isActive: radioViewModel.activeVFO == .b)
|
||||
Spacer()
|
||||
LCDIndicator(label: radioViewModel.mode.rawValue, isActive: true, color: .cyan)
|
||||
Spacer()
|
||||
LCDIndicator(label: "TX", isActive: radioViewModel.isTransmitting, color: .red)
|
||||
}
|
||||
.padding(.horizontal)
|
||||
|
||||
// Main frequency display
|
||||
HStack {
|
||||
Spacer()
|
||||
Text(radioViewModel.frequencyDisplay)
|
||||
.font(.system(size: 56, weight: .bold, design: .monospaced))
|
||||
.foregroundColor(Color(red: 0.3, green: 1.0, blue: 0.5))
|
||||
.shadow(color: Color(red: 0.3, green: 1.0, blue: 0.5).opacity(0.5), radius: 10)
|
||||
Text("Hz")
|
||||
.font(.system(size: 20, weight: .medium, design: .monospaced))
|
||||
.foregroundColor(Color(red: 0.3, green: 1.0, blue: 0.5).opacity(0.7))
|
||||
Spacer()
|
||||
}
|
||||
|
||||
// S-Meter
|
||||
LCDSMeter(value: Double(radioViewModel.sMeter) / 255.0)
|
||||
.padding(.horizontal)
|
||||
|
||||
// Bottom row - Additional info
|
||||
HStack {
|
||||
Text("\(radioViewModel.power)W")
|
||||
.foregroundColor(Color(red: 0.3, green: 1.0, blue: 0.5).opacity(0.8))
|
||||
Spacer()
|
||||
if let band = radioViewModel.currentBand {
|
||||
Text(band.rawValue)
|
||||
.foregroundColor(Color(red: 0.3, green: 1.0, blue: 0.5).opacity(0.8))
|
||||
}
|
||||
Spacer()
|
||||
Text(radioViewModel.sMeterDisplay)
|
||||
.foregroundColor(Color(red: 0.3, green: 1.0, blue: 0.5).opacity(0.8))
|
||||
}
|
||||
.font(.system(size: 14, design: .monospaced))
|
||||
.padding(.horizontal)
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
.frame(height: 200)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - LCD Indicator
|
||||
|
||||
struct LCDIndicator: View {
|
||||
let label: String
|
||||
let isActive: Bool
|
||||
var color: Color = .green
|
||||
|
||||
var body: some View {
|
||||
Text(label)
|
||||
.font(.system(size: 12, weight: .bold, design: .monospaced))
|
||||
.foregroundColor(isActive ? color : color.opacity(0.3))
|
||||
.padding(.horizontal, 6)
|
||||
.padding(.vertical, 2)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 3)
|
||||
.fill(isActive ? color.opacity(0.2) : Color.clear)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - LCD S-Meter
|
||||
|
||||
struct LCDSMeter: View {
|
||||
let value: Double
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 2) {
|
||||
// Scale labels
|
||||
HStack {
|
||||
ForEach([1, 3, 5, 7, 9], id: \.self) { s in
|
||||
Text("S\(s)")
|
||||
.font(.system(size: 8, design: .monospaced))
|
||||
.foregroundColor(Color(red: 0.3, green: 1.0, blue: 0.5).opacity(0.5))
|
||||
if s < 9 { Spacer() }
|
||||
}
|
||||
Text("+20")
|
||||
.font(.system(size: 8, design: .monospaced))
|
||||
.foregroundColor(Color.red.opacity(0.5))
|
||||
Spacer()
|
||||
Text("+60")
|
||||
.font(.system(size: 8, design: .monospaced))
|
||||
.foregroundColor(Color.red.opacity(0.5))
|
||||
}
|
||||
|
||||
// Bar segments
|
||||
HStack(spacing: 2) {
|
||||
ForEach(0..<20, id: \.self) { i in
|
||||
let threshold = Double(i) / 20.0
|
||||
let isLit = value >= threshold
|
||||
let isRed = i >= 12 // Above S9
|
||||
|
||||
RoundedRectangle(cornerRadius: 1)
|
||||
.fill(isLit ? (isRed ? Color.red : Color(red: 0.3, green: 1.0, blue: 0.5)) : Color.gray.opacity(0.2))
|
||||
.frame(height: 16)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Dial Knob
|
||||
|
||||
struct DialKnob: View {
|
||||
let label: String
|
||||
@Binding var value: Double
|
||||
|
||||
@State private var isDragging = false
|
||||
@State private var lastAngle: Double = 0
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 8) {
|
||||
Text(label)
|
||||
.font(.system(size: 10, weight: .bold))
|
||||
.foregroundColor(.gray)
|
||||
|
||||
ZStack {
|
||||
// Knob base
|
||||
Circle()
|
||||
.fill(
|
||||
LinearGradient(
|
||||
colors: [Color(white: 0.3), Color(white: 0.15)],
|
||||
startPoint: .topLeading,
|
||||
endPoint: .bottomTrailing
|
||||
)
|
||||
)
|
||||
.overlay(
|
||||
Circle()
|
||||
.stroke(Color.gray.opacity(0.5), lineWidth: 2)
|
||||
)
|
||||
.shadow(color: .black.opacity(0.5), radius: 5, x: 2, y: 2)
|
||||
|
||||
// Knob texture (ridges)
|
||||
ForEach(0..<12, id: \.self) { i in
|
||||
Rectangle()
|
||||
.fill(Color.white.opacity(0.1))
|
||||
.frame(width: 1, height: 25)
|
||||
.offset(y: -15)
|
||||
.rotationEffect(.degrees(Double(i) * 30))
|
||||
}
|
||||
|
||||
// Indicator line
|
||||
Rectangle()
|
||||
.fill(Color.white)
|
||||
.frame(width: 3, height: 15)
|
||||
.offset(y: -20)
|
||||
.rotationEffect(.degrees(value * 270 - 135))
|
||||
}
|
||||
.frame(width: 60, height: 60)
|
||||
.gesture(
|
||||
DragGesture()
|
||||
.onChanged { gesture in
|
||||
let center = CGPoint(x: 30, y: 30)
|
||||
let location = gesture.location
|
||||
let angle = atan2(location.y - center.y, location.x - center.x)
|
||||
let degrees = angle * 180 / .pi + 90
|
||||
|
||||
if isDragging {
|
||||
let delta = (degrees - lastAngle) / 270
|
||||
value = min(1, max(0, value + delta))
|
||||
}
|
||||
|
||||
lastAngle = degrees
|
||||
isDragging = true
|
||||
}
|
||||
.onEnded { _ in
|
||||
isDragging = false
|
||||
}
|
||||
)
|
||||
|
||||
Text("\(Int(value * 100))%")
|
||||
.font(.system(size: 10, design: .monospaced))
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Main VFO Dial
|
||||
|
||||
struct MainVFODial: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
@EnvironmentObject var settingsController: SettingsController
|
||||
|
||||
@State private var rotation: Double = 0
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 12) {
|
||||
Text("MAIN DIAL")
|
||||
.font(.system(size: 12, weight: .bold))
|
||||
.foregroundColor(.gray)
|
||||
|
||||
ZStack {
|
||||
// Large dial
|
||||
Circle()
|
||||
.fill(
|
||||
LinearGradient(
|
||||
colors: [Color(white: 0.25), Color(white: 0.1)],
|
||||
startPoint: .topLeading,
|
||||
endPoint: .bottomTrailing
|
||||
)
|
||||
)
|
||||
.overlay(
|
||||
Circle()
|
||||
.stroke(Color.gray.opacity(0.5), lineWidth: 3)
|
||||
)
|
||||
.shadow(color: .black.opacity(0.5), radius: 10, x: 4, y: 4)
|
||||
|
||||
// Dial markings
|
||||
ForEach(0..<36, id: \.self) { i in
|
||||
Rectangle()
|
||||
.fill(Color.white.opacity(i % 3 == 0 ? 0.3 : 0.1))
|
||||
.frame(width: i % 3 == 0 ? 2 : 1, height: i % 3 == 0 ? 20 : 10)
|
||||
.offset(y: -65)
|
||||
.rotationEffect(.degrees(Double(i) * 10 + rotation))
|
||||
}
|
||||
|
||||
// Center cap
|
||||
Circle()
|
||||
.fill(Color(white: 0.2))
|
||||
.frame(width: 40, height: 40)
|
||||
.overlay(
|
||||
Circle()
|
||||
.stroke(Color.gray.opacity(0.3), lineWidth: 1)
|
||||
)
|
||||
}
|
||||
.frame(width: 160, height: 160)
|
||||
.gesture(
|
||||
DragGesture()
|
||||
.onChanged { gesture in
|
||||
let delta = gesture.translation.width / 2
|
||||
rotation += delta
|
||||
|
||||
// Convert rotation to frequency change
|
||||
let steps = Int(delta / 10)
|
||||
if steps != 0 {
|
||||
for _ in 0..<abs(steps) {
|
||||
if steps > 0 {
|
||||
radioViewModel.incrementFrequency()
|
||||
} else {
|
||||
radioViewModel.decrementFrequency()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
// Step indicator
|
||||
Picker("Step", selection: $settingsController.frequencyStep) {
|
||||
ForEach(FrequencyStep.allCases, id: \.self) { step in
|
||||
Text(step.displayName).tag(step)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.menu)
|
||||
.frame(width: 100)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Front Panel Buttons
|
||||
|
||||
struct FrontPanelButtons: View {
|
||||
@EnvironmentObject var radioViewModel: RadioViewModel
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 12) {
|
||||
// Mode buttons
|
||||
Group {
|
||||
PanelButton(label: "LSB", isActive: radioViewModel.mode == .lsb) {
|
||||
radioViewModel.setMode(.lsb)
|
||||
}
|
||||
PanelButton(label: "USB", isActive: radioViewModel.mode == .usb) {
|
||||
radioViewModel.setMode(.usb)
|
||||
}
|
||||
PanelButton(label: "CW", isActive: radioViewModel.mode == .cw) {
|
||||
radioViewModel.setMode(.cw)
|
||||
}
|
||||
PanelButton(label: "FM", isActive: radioViewModel.mode == .fm) {
|
||||
radioViewModel.setMode(.fm)
|
||||
}
|
||||
PanelButton(label: "AM", isActive: radioViewModel.mode == .am) {
|
||||
radioViewModel.setMode(.am)
|
||||
}
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
// Function buttons
|
||||
Group {
|
||||
PanelButton(label: "NB", isActive: radioViewModel.noiseBlanker) {
|
||||
radioViewModel.toggleNB()
|
||||
}
|
||||
PanelButton(label: "NR", isActive: radioViewModel.noiseReduction) {
|
||||
radioViewModel.toggleNR()
|
||||
}
|
||||
PanelButton(label: "ATU", isActive: false, color: .orange) {
|
||||
radioViewModel.startATUTune()
|
||||
}
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
// VFO buttons
|
||||
Group {
|
||||
PanelButton(label: "A/B", isActive: false) {
|
||||
radioViewModel.swapVFO()
|
||||
}
|
||||
PanelButton(label: "SPLIT", isActive: radioViewModel.split) {
|
||||
radioViewModel.toggleSplit()
|
||||
}
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
|
||||
Spacer()
|
||||
|
||||
// PTT
|
||||
PanelButton(label: radioViewModel.isTransmitting ? "RX" : "TX",
|
||||
isActive: radioViewModel.isTransmitting,
|
||||
color: .red,
|
||||
size: .large) {
|
||||
radioViewModel.toggleTransmit()
|
||||
}
|
||||
.disabled(!radioViewModel.isConnected)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Panel Button
|
||||
|
||||
struct PanelButton: View {
|
||||
let label: String
|
||||
let isActive: Bool
|
||||
var color: Color = .green
|
||||
var size: Size = .normal
|
||||
let action: () -> Void
|
||||
|
||||
enum Size {
|
||||
case normal, large
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
Button(action: action) {
|
||||
Text(label)
|
||||
.font(.system(size: size == .large ? 14 : 11, weight: .bold))
|
||||
.foregroundColor(isActive ? .white : .gray)
|
||||
.frame(width: size == .large ? 60 : 45, height: size == .large ? 40 : 30)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 4)
|
||||
.fill(isActive ? color : Color(white: 0.2))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 4)
|
||||
.stroke(Color.gray.opacity(0.3), lineWidth: 1)
|
||||
)
|
||||
.shadow(color: isActive ? color.opacity(0.5) : .clear, radius: 5)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Preview
|
||||
|
||||
#Preview {
|
||||
SkeuomorphRadioView()
|
||||
.environmentObject(RadioViewModel())
|
||||
.environmentObject(SettingsController())
|
||||
.frame(width: 900, height: 700)
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
# FT-991A Remote Control App für macOS
|
||||
|
||||
Eine native macOS-Anwendung zur Fernsteuerung des Yaesu FT-991A Amateurfunk-Transceivers über USB (CAT-Protokoll).
|
||||
|
||||
## Features
|
||||
|
||||
### Verbindung
|
||||
- USB virtueller COM-Port (Silicon Labs CP210x)
|
||||
- Auto-Reconnect bei Verbindungsabbruch
|
||||
- Unterstützte Baudraten: 4800, 9600, 19200, 38400 (Standard), 57600, 115200
|
||||
|
||||
### Benutzeroberfläche
|
||||
- **Modern View**: Modernes, abstraktes UI-Design
|
||||
- **Skeuomorph View**: Originalgetreue Nachbildung des FT-991A Frontpanels
|
||||
- Abdockbare Panels (Log, Debug, Audio, Metering)
|
||||
- Menüleisten-Betrieb für Hintergrundbetrieb
|
||||
- Lokalisierung: Deutsch & Englisch
|
||||
|
||||
### Steuerung
|
||||
- VFO A/B Frequenzsteuerung
|
||||
- Betriebsarten: LSB, USB, CW, FM, AM, RTTY, DATA, C4FM
|
||||
- Pegel: AF Gain, RF Gain, Squelch, MIC Gain, Power
|
||||
- Funktionen: NB, NR, DNF, Contour, ATU, Split, IPO
|
||||
- S-Meter, Power-Meter, SWR-Meter Anzeige
|
||||
- PTT-Steuerung (Shift-Taste)
|
||||
|
||||
### Logging
|
||||
- QSO-Log im CSV-Format
|
||||
- Felder: Call, Datum, Zeit, Frequenz, Mode, RST TX/RX, Name, QTH, Locator, Power, Notizen
|
||||
- Wählbarer Speicherort (Standard: ~/Documents/FT991A-Logs/)
|
||||
- Automatisches Speichern
|
||||
|
||||
### Audio
|
||||
- BlackHole Integration für digitale Betriebsarten
|
||||
- Audio-Routing für WSJT-X, fldigi, etc.
|
||||
|
||||
### Tastaturkürzel
|
||||
| Taste | Funktion |
|
||||
|-------|----------|
|
||||
| ⌘K | Verbinden/Trennen |
|
||||
| Shift (halten) | PTT |
|
||||
| ↑ | ATU Tune |
|
||||
| ← / → | Frequenz -/+ |
|
||||
| ⇧⌘S | VFO A/B tauschen |
|
||||
| ⇧⌘E | A=B |
|
||||
| ⌥⌘D | Debug-Panel |
|
||||
| ⌥⌘L | Log-Panel |
|
||||
|
||||
## Systemanforderungen
|
||||
|
||||
- macOS 15.0 (Sequoia) oder neuer
|
||||
- Yaesu FT-991A mit USB-Kabel
|
||||
- Silicon Labs CP210x Treiber (normalerweise automatisch installiert)
|
||||
|
||||
## FT-991A Einstellungen
|
||||
|
||||
Stelle sicher, dass im Radio-Menü folgende Einstellungen aktiv sind:
|
||||
|
||||
```
|
||||
Menu → CAT RATE: 38400 bps
|
||||
Menu → CAT TOT: 100 ms
|
||||
Menu → CAT RTS: OFF
|
||||
```
|
||||
|
||||
## Installation
|
||||
|
||||
1. Projekt in Xcode öffnen
|
||||
2. Build & Run (⌘R)
|
||||
|
||||
Oder für Release-Build:
|
||||
1. Product → Archive
|
||||
2. Distribute App → Copy App
|
||||
|
||||
## Projektstruktur
|
||||
|
||||
```
|
||||
FT991A-Remote/
|
||||
├── FT991A_RemoteApp.swift # App Entry Point
|
||||
├── Models/
|
||||
│ ├── RadioState.swift # Gerätezustand
|
||||
│ ├── CATCommand.swift # CAT-Befehle
|
||||
│ ├── QSOEntry.swift # Log-Einträge
|
||||
│ └── Settings.swift # Einstellungen
|
||||
├── Services/
|
||||
│ ├── SerialPortManager.swift # USB Serial
|
||||
│ ├── CATProtocol.swift # CAT Parser
|
||||
│ ├── CSVManager.swift # Log-Dateien
|
||||
│ └── AudioRouter.swift # BlackHole
|
||||
├── ViewModels/
|
||||
│ ├── RadioViewModel.swift # Radio-Logik
|
||||
│ ├── LogViewModel.swift # Log-Logik
|
||||
│ └── SettingsController.swift # Einstellungen
|
||||
├── Views/
|
||||
│ ├── MainView.swift # Hauptfenster
|
||||
│ ├── ModernView/ # Moderne UI
|
||||
│ ├── SkeuomorphView/ # Frontpanel
|
||||
│ ├── Panels/ # Abdockbare Panels
|
||||
│ ├── Settings/ # Einstellungen
|
||||
│ └── MenuBar/ # Menüleiste
|
||||
└── Utilities/
|
||||
├── Logger.swift # Logging
|
||||
└── Localization/ # DE/EN
|
||||
```
|
||||
|
||||
## CAT-Befehle
|
||||
|
||||
Die App verwendet das Yaesu CAT-Protokoll. Wichtige Befehle:
|
||||
|
||||
| Befehl | Funktion |
|
||||
|--------|----------|
|
||||
| FA; | VFO-A Frequenz lesen |
|
||||
| FA014250000; | VFO-A auf 14.250 MHz setzen |
|
||||
| MD02; | Mode auf USB setzen |
|
||||
| TX0; | PTT ein (MIC) |
|
||||
| RX; | PTT aus |
|
||||
| SM0; | S-Meter lesen |
|
||||
|
||||
## Entwicklung
|
||||
|
||||
### Phase 1 (aktuell)
|
||||
- ✅ Projekt-Setup
|
||||
- ✅ SerialPortManager
|
||||
- ✅ CAT-Protokoll Parser
|
||||
- ✅ RadioState Model
|
||||
- ✅ Debug-UI
|
||||
- ✅ Logging-System
|
||||
|
||||
### Phase 2-6 (geplant)
|
||||
- Vollständiger CAT-Befehlssatz
|
||||
- Erweiterte UI (Skeuomorph-Ansicht)
|
||||
- QSO-Logging & CSV
|
||||
- BlackHole Audio-Routing
|
||||
- Tastaturkürzel
|
||||
- Testing & Polish
|
||||
|
||||
## Lizenz
|
||||
|
||||
MIT License
|
||||
|
||||
## Autor
|
||||
|
||||
Entwickelt für Amateurfunk-Enthusiasten.
|
||||
|
||||
73!
|
||||
@@ -0,0 +1,120 @@
|
||||
//
|
||||
// AppDelegate.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Application delegate handling app lifecycle
|
||||
//
|
||||
|
||||
import AppKit
|
||||
import AVFoundation
|
||||
|
||||
/// Application delegate
|
||||
final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
// MARK: - Properties
|
||||
|
||||
private var mainWindowController: MainWindowController?
|
||||
|
||||
// MARK: - App Lifecycle
|
||||
|
||||
func applicationDidFinishLaunching(_ notification: Notification) {
|
||||
// Request microphone permission
|
||||
requestMicrophonePermission()
|
||||
|
||||
// Create and show main window
|
||||
mainWindowController = MainWindowController()
|
||||
mainWindowController?.showWindow(nil)
|
||||
mainWindowController?.window?.makeKeyAndOrderFront(nil)
|
||||
|
||||
// Activate the application
|
||||
NSApp.activate(ignoringOtherApps: true)
|
||||
|
||||
print("[AppDelegate] Application launched")
|
||||
}
|
||||
|
||||
func applicationWillTerminate(_ notification: Notification) {
|
||||
// Save settings
|
||||
SettingsManager.shared.saveNow()
|
||||
|
||||
print("[AppDelegate] Application terminating")
|
||||
}
|
||||
|
||||
func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// MARK: - Permissions
|
||||
|
||||
private func requestMicrophonePermission() {
|
||||
switch AVCaptureDevice.authorizationStatus(for: .audio) {
|
||||
case .authorized:
|
||||
print("[AppDelegate] Microphone access already authorized")
|
||||
|
||||
case .notDetermined:
|
||||
AVCaptureDevice.requestAccess(for: .audio) { granted in
|
||||
if granted {
|
||||
print("[AppDelegate] Microphone access granted")
|
||||
} else {
|
||||
print("[AppDelegate] Microphone access denied")
|
||||
self.showMicrophonePermissionAlert()
|
||||
}
|
||||
}
|
||||
|
||||
case .denied, .restricted:
|
||||
print("[AppDelegate] Microphone access denied or restricted")
|
||||
showMicrophonePermissionAlert()
|
||||
|
||||
@unknown default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
private func showMicrophonePermissionAlert() {
|
||||
DispatchQueue.main.async {
|
||||
let alert = NSAlert()
|
||||
alert.messageText = "Microphone Access Required"
|
||||
alert.informativeText = "Psytrance Visualizer needs access to your audio input to visualize music. Please enable microphone access in System Preferences > Security & Privacy > Privacy > Microphone."
|
||||
alert.alertStyle = .warning
|
||||
alert.addButton(withTitle: "Open System Preferences")
|
||||
alert.addButton(withTitle: "Cancel")
|
||||
|
||||
if alert.runModal() == .alertFirstButtonReturn {
|
||||
if let url = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_Microphone") {
|
||||
NSWorkspace.shared.open(url)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Menu Actions
|
||||
|
||||
@IBAction func showAbout(_ sender: Any) {
|
||||
let alert = NSAlert()
|
||||
alert.messageText = "Psytrance Visualizer"
|
||||
alert.informativeText = """
|
||||
An audio-reactive visualizer for psytrance music.
|
||||
|
||||
8 Visualization Modes:
|
||||
1 - FFT Classic
|
||||
2 - Mel Spectrogram
|
||||
3 - Sub-Bass
|
||||
4 - Sidechain Pump
|
||||
5 - Harmonic/Noise
|
||||
6 - Mandelbrot
|
||||
7 - Tunnel Warp
|
||||
8 - DMT Geometry
|
||||
|
||||
Keyboard Shortcuts:
|
||||
1-8: Switch visualization mode
|
||||
F: Toggle fullscreen
|
||||
ESC: Exit fullscreen
|
||||
|
||||
Tip: Use a virtual audio device like BlackHole to route system audio.
|
||||
"""
|
||||
alert.alertStyle = .informational
|
||||
alert.runModal()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
//
|
||||
// PsytranceVisualizerApp.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Main application entry point
|
||||
//
|
||||
|
||||
import AppKit
|
||||
|
||||
// MARK: - Main Entry Point
|
||||
|
||||
/// Application entry point
|
||||
@main
|
||||
struct PsytranceVisualizerApp {
|
||||
static func main() {
|
||||
// Create the application
|
||||
let app = NSApplication.shared
|
||||
|
||||
// Set up the delegate
|
||||
let delegate = AppDelegate()
|
||||
app.delegate = delegate
|
||||
|
||||
// Set activation policy
|
||||
app.setActivationPolicy(.regular)
|
||||
|
||||
// Create the main menu
|
||||
setupMainMenu()
|
||||
|
||||
// Run the application
|
||||
app.run()
|
||||
}
|
||||
|
||||
/// Sets up the application's main menu
|
||||
private static func setupMainMenu() {
|
||||
let mainMenu = NSMenu()
|
||||
|
||||
// Application menu
|
||||
let appMenuItem = NSMenuItem()
|
||||
mainMenu.addItem(appMenuItem)
|
||||
|
||||
let appMenu = NSMenu()
|
||||
appMenuItem.submenu = appMenu
|
||||
|
||||
appMenu.addItem(withTitle: "About Psytrance Visualizer",
|
||||
action: #selector(AppDelegate.showAbout(_:)),
|
||||
keyEquivalent: "")
|
||||
|
||||
appMenu.addItem(NSMenuItem.separator())
|
||||
|
||||
appMenu.addItem(withTitle: "Hide Psytrance Visualizer",
|
||||
action: #selector(NSApplication.hide(_:)),
|
||||
keyEquivalent: "h")
|
||||
|
||||
let hideOthersItem = appMenu.addItem(withTitle: "Hide Others",
|
||||
action: #selector(NSApplication.hideOtherApplications(_:)),
|
||||
keyEquivalent: "h")
|
||||
hideOthersItem.keyEquivalentModifierMask = [.command, .option]
|
||||
|
||||
appMenu.addItem(withTitle: "Show All",
|
||||
action: #selector(NSApplication.unhideAllApplications(_:)),
|
||||
keyEquivalent: "")
|
||||
|
||||
appMenu.addItem(NSMenuItem.separator())
|
||||
|
||||
appMenu.addItem(withTitle: "Quit Psytrance Visualizer",
|
||||
action: #selector(NSApplication.terminate(_:)),
|
||||
keyEquivalent: "q")
|
||||
|
||||
// View menu
|
||||
let viewMenuItem = NSMenuItem()
|
||||
mainMenu.addItem(viewMenuItem)
|
||||
|
||||
let viewMenu = NSMenu(title: "View")
|
||||
viewMenuItem.submenu = viewMenu
|
||||
|
||||
viewMenu.addItem(withTitle: "Toggle Fullscreen",
|
||||
action: #selector(NSWindow.toggleFullScreen(_:)),
|
||||
keyEquivalent: "f")
|
||||
|
||||
viewMenu.addItem(NSMenuItem.separator())
|
||||
|
||||
// Visualization mode submenu
|
||||
let modesMenuItem = NSMenuItem(title: "Visualization Mode", action: nil, keyEquivalent: "")
|
||||
let modesMenu = NSMenu()
|
||||
|
||||
for mode in VisualizationMode.allCases {
|
||||
let item = NSMenuItem(title: mode.displayName,
|
||||
action: nil,
|
||||
keyEquivalent: mode.shortcut)
|
||||
item.tag = mode.rawValue
|
||||
modesMenu.addItem(item)
|
||||
}
|
||||
|
||||
modesMenuItem.submenu = modesMenu
|
||||
viewMenu.addItem(modesMenuItem)
|
||||
|
||||
// Window menu
|
||||
let windowMenuItem = NSMenuItem()
|
||||
mainMenu.addItem(windowMenuItem)
|
||||
|
||||
let windowMenu = NSMenu(title: "Window")
|
||||
windowMenuItem.submenu = windowMenu
|
||||
|
||||
windowMenu.addItem(withTitle: "Minimize",
|
||||
action: #selector(NSWindow.miniaturize(_:)),
|
||||
keyEquivalent: "m")
|
||||
|
||||
windowMenu.addItem(withTitle: "Zoom",
|
||||
action: #selector(NSWindow.zoom(_:)),
|
||||
keyEquivalent: "")
|
||||
|
||||
windowMenu.addItem(NSMenuItem.separator())
|
||||
|
||||
windowMenu.addItem(withTitle: "Bring All to Front",
|
||||
action: #selector(NSApplication.arrangeInFront(_:)),
|
||||
keyEquivalent: "")
|
||||
|
||||
// Help menu
|
||||
let helpMenuItem = NSMenuItem()
|
||||
mainMenu.addItem(helpMenuItem)
|
||||
|
||||
let helpMenu = NSMenu(title: "Help")
|
||||
helpMenuItem.submenu = helpMenu
|
||||
|
||||
helpMenu.addItem(withTitle: "Psytrance Visualizer Help",
|
||||
action: #selector(AppDelegate.showAbout(_:)),
|
||||
keyEquivalent: "?")
|
||||
|
||||
NSApp.mainMenu = mainMenu
|
||||
NSApp.windowsMenu = windowMenu
|
||||
NSApp.helpMenu = helpMenu
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,357 @@
|
||||
//
|
||||
// AudioInputManager.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Manages audio input devices and captures audio buffers
|
||||
//
|
||||
|
||||
import AVFoundation
|
||||
import CoreAudio
|
||||
import Combine
|
||||
|
||||
/// Represents an audio input device
|
||||
struct AudioDevice: Identifiable, Hashable {
|
||||
let id: AudioDeviceID
|
||||
let uid: String
|
||||
let name: String
|
||||
let manufacturer: String
|
||||
let isInput: Bool
|
||||
|
||||
func hash(into hasher: inout Hasher) {
|
||||
hasher.combine(uid)
|
||||
}
|
||||
|
||||
static func == (lhs: AudioDevice, rhs: AudioDevice) -> Bool {
|
||||
lhs.uid == rhs.uid
|
||||
}
|
||||
}
|
||||
|
||||
/// Manages audio input capture using AVAudioEngine
|
||||
final class AudioInputManager: ObservableObject {
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published private(set) var availableDevices: [AudioDevice] = []
|
||||
@Published private(set) var selectedDevice: AudioDevice?
|
||||
@Published private(set) var isRunning = false
|
||||
@Published private(set) var currentBufferSize: Int = 1024
|
||||
|
||||
// MARK: - Audio Properties
|
||||
|
||||
private var audioEngine: AVAudioEngine?
|
||||
private var inputNode: AVAudioInputNode?
|
||||
private let sampleRate: Double = 44100.0
|
||||
|
||||
// MARK: - Callbacks
|
||||
|
||||
var onAudioBuffer: ((AVAudioPCMBuffer) -> Void)?
|
||||
|
||||
// MARK: - Private Properties
|
||||
|
||||
private var deviceListenerBlock: AudioObjectPropertyListenerBlock?
|
||||
private let processingQueue = DispatchQueue(label: "com.psytrance.audio", qos: .userInteractive)
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
refreshDeviceList()
|
||||
setupDeviceChangeListener()
|
||||
}
|
||||
|
||||
deinit {
|
||||
stop()
|
||||
removeDeviceChangeListener()
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
|
||||
/// Returns list of available audio input devices
|
||||
func getAvailableInputDevices() -> [AudioDevice] {
|
||||
return availableDevices
|
||||
}
|
||||
|
||||
/// Refreshes the list of available audio input devices
|
||||
func refreshDeviceList() {
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioHardwarePropertyDevices,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
var dataSize: UInt32 = 0
|
||||
var status = AudioObjectGetPropertyDataSize(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
0,
|
||||
nil,
|
||||
&dataSize
|
||||
)
|
||||
|
||||
guard status == noErr else {
|
||||
print("[AudioInputManager] Failed to get device list size: \(status)")
|
||||
return
|
||||
}
|
||||
|
||||
let deviceCount = Int(dataSize) / MemoryLayout<AudioDeviceID>.size
|
||||
var deviceIDs = [AudioDeviceID](repeating: 0, count: deviceCount)
|
||||
|
||||
status = AudioObjectGetPropertyData(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
0,
|
||||
nil,
|
||||
&dataSize,
|
||||
&deviceIDs
|
||||
)
|
||||
|
||||
guard status == noErr else {
|
||||
print("[AudioInputManager] Failed to get device list: \(status)")
|
||||
return
|
||||
}
|
||||
|
||||
var devices: [AudioDevice] = []
|
||||
|
||||
for deviceID in deviceIDs {
|
||||
if let device = getDeviceInfo(deviceID: deviceID), device.isInput {
|
||||
devices.append(device)
|
||||
}
|
||||
}
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.availableDevices = devices
|
||||
print("[AudioInputManager] Found \(devices.count) input devices")
|
||||
}
|
||||
}
|
||||
|
||||
/// Selects an audio input device by UID
|
||||
func selectDevice(uid: String) {
|
||||
guard let device = availableDevices.first(where: { $0.uid == uid }) else {
|
||||
print("[AudioInputManager] Device not found: \(uid)")
|
||||
return
|
||||
}
|
||||
|
||||
let wasRunning = isRunning
|
||||
if wasRunning {
|
||||
stop()
|
||||
}
|
||||
|
||||
selectedDevice = device
|
||||
setSystemInputDevice(deviceID: device.id)
|
||||
|
||||
if wasRunning {
|
||||
start()
|
||||
}
|
||||
|
||||
print("[AudioInputManager] Selected device: \(device.name)")
|
||||
}
|
||||
|
||||
/// Sets the buffer size (512 or 1024)
|
||||
func setBufferSize(_ size: Int) {
|
||||
guard [512, 1024].contains(size) else {
|
||||
print("[AudioInputManager] Invalid buffer size: \(size)")
|
||||
return
|
||||
}
|
||||
|
||||
let wasRunning = isRunning
|
||||
if wasRunning {
|
||||
stop()
|
||||
}
|
||||
|
||||
currentBufferSize = size
|
||||
|
||||
if wasRunning {
|
||||
start()
|
||||
}
|
||||
|
||||
print("[AudioInputManager] Buffer size set to: \(size)")
|
||||
}
|
||||
|
||||
/// Starts audio capture
|
||||
func start() {
|
||||
guard !isRunning else { return }
|
||||
|
||||
do {
|
||||
// Create new audio engine
|
||||
audioEngine = AVAudioEngine()
|
||||
guard let engine = audioEngine else { return }
|
||||
|
||||
inputNode = engine.inputNode
|
||||
|
||||
guard let inputNode = inputNode else {
|
||||
print("[AudioInputManager] No input node available")
|
||||
return
|
||||
}
|
||||
|
||||
// Get the input format
|
||||
let inputFormat = inputNode.outputFormat(forBus: 0)
|
||||
|
||||
print("[AudioInputManager] Input format: \(inputFormat)")
|
||||
|
||||
// Install tap on input node
|
||||
let bufferSize = AVAudioFrameCount(currentBufferSize)
|
||||
|
||||
inputNode.installTap(onBus: 0, bufferSize: bufferSize, format: inputFormat) { [weak self] buffer, _ in
|
||||
self?.processingQueue.async {
|
||||
self?.onAudioBuffer?(buffer)
|
||||
}
|
||||
}
|
||||
|
||||
// Prepare and start the engine
|
||||
engine.prepare()
|
||||
try engine.start()
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.isRunning = true
|
||||
}
|
||||
|
||||
print("[AudioInputManager] Audio capture started")
|
||||
|
||||
} catch {
|
||||
print("[AudioInputManager] Failed to start audio capture: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
/// Stops audio capture
|
||||
func stop() {
|
||||
guard isRunning else { return }
|
||||
|
||||
inputNode?.removeTap(onBus: 0)
|
||||
audioEngine?.stop()
|
||||
audioEngine = nil
|
||||
inputNode = nil
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.isRunning = false
|
||||
}
|
||||
|
||||
print("[AudioInputManager] Audio capture stopped")
|
||||
}
|
||||
|
||||
// MARK: - Private Methods
|
||||
|
||||
/// Gets device info for a specific device ID
|
||||
private func getDeviceInfo(deviceID: AudioDeviceID) -> AudioDevice? {
|
||||
// Check if device has input channels
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioDevicePropertyStreamConfiguration,
|
||||
mScope: kAudioDevicePropertyScopeInput,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
var dataSize: UInt32 = 0
|
||||
var status = AudioObjectGetPropertyDataSize(deviceID, &propertyAddress, 0, nil, &dataSize)
|
||||
|
||||
guard status == noErr, dataSize > 0 else { return nil }
|
||||
|
||||
let bufferListPointer = UnsafeMutablePointer<AudioBufferList>.allocate(capacity: Int(dataSize))
|
||||
defer { bufferListPointer.deallocate() }
|
||||
|
||||
status = AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, nil, &dataSize, bufferListPointer)
|
||||
|
||||
guard status == noErr else { return nil }
|
||||
|
||||
let bufferList = UnsafeMutableAudioBufferListPointer(bufferListPointer)
|
||||
var inputChannelCount: UInt32 = 0
|
||||
for buffer in bufferList {
|
||||
inputChannelCount += buffer.mNumberChannels
|
||||
}
|
||||
|
||||
guard inputChannelCount > 0 else { return nil }
|
||||
|
||||
// Get device UID
|
||||
var uid: CFString = "" as CFString
|
||||
var uidSize = UInt32(MemoryLayout<CFString>.size)
|
||||
propertyAddress.mSelector = kAudioDevicePropertyDeviceUID
|
||||
propertyAddress.mScope = kAudioObjectPropertyScopeGlobal
|
||||
|
||||
status = AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, nil, &uidSize, &uid)
|
||||
guard status == noErr else { return nil }
|
||||
|
||||
// Get device name
|
||||
var name: CFString = "" as CFString
|
||||
var nameSize = UInt32(MemoryLayout<CFString>.size)
|
||||
propertyAddress.mSelector = kAudioDevicePropertyDeviceNameCFString
|
||||
|
||||
status = AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, nil, &nameSize, &name)
|
||||
guard status == noErr else { return nil }
|
||||
|
||||
// Get manufacturer
|
||||
var manufacturer: CFString = "" as CFString
|
||||
var manufacturerSize = UInt32(MemoryLayout<CFString>.size)
|
||||
propertyAddress.mSelector = kAudioDevicePropertyDeviceManufacturerCFString
|
||||
|
||||
AudioObjectGetPropertyData(deviceID, &propertyAddress, 0, nil, &manufacturerSize, &manufacturer)
|
||||
|
||||
return AudioDevice(
|
||||
id: deviceID,
|
||||
uid: uid as String,
|
||||
name: name as String,
|
||||
manufacturer: manufacturer as String,
|
||||
isInput: true
|
||||
)
|
||||
}
|
||||
|
||||
/// Sets the system default input device
|
||||
private func setSystemInputDevice(deviceID: AudioDeviceID) {
|
||||
var deviceIDCopy = deviceID
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioHardwarePropertyDefaultInputDevice,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
let status = AudioObjectSetPropertyData(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
0,
|
||||
nil,
|
||||
UInt32(MemoryLayout<AudioDeviceID>.size),
|
||||
&deviceIDCopy
|
||||
)
|
||||
|
||||
if status != noErr {
|
||||
print("[AudioInputManager] Failed to set input device: \(status)")
|
||||
}
|
||||
}
|
||||
|
||||
/// Sets up listener for device changes
|
||||
private func setupDeviceChangeListener() {
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioHardwarePropertyDevices,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
deviceListenerBlock = { [weak self] _, _ in
|
||||
DispatchQueue.main.async {
|
||||
self?.refreshDeviceList()
|
||||
}
|
||||
}
|
||||
|
||||
if let block = deviceListenerBlock {
|
||||
AudioObjectAddPropertyListenerBlock(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
DispatchQueue.main,
|
||||
block
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/// Removes device change listener
|
||||
private func removeDeviceChangeListener() {
|
||||
guard let block = deviceListenerBlock else { return }
|
||||
|
||||
var propertyAddress = AudioObjectPropertyAddress(
|
||||
mSelector: kAudioHardwarePropertyDevices,
|
||||
mScope: kAudioObjectPropertyScopeGlobal,
|
||||
mElement: kAudioObjectPropertyElementMain
|
||||
)
|
||||
|
||||
AudioObjectRemovePropertyListenerBlock(
|
||||
AudioObjectID(kAudioObjectSystemObject),
|
||||
&propertyAddress,
|
||||
DispatchQueue.main,
|
||||
block
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,468 @@
|
||||
//
|
||||
// DSPEngine.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Digital Signal Processing engine for audio analysis
|
||||
//
|
||||
|
||||
import Accelerate
|
||||
import AVFoundation
|
||||
|
||||
/// DSP Engine for real-time audio analysis
|
||||
final class DSPEngine {
|
||||
// MARK: - Configuration
|
||||
|
||||
private let sampleRate: Float = 44100.0
|
||||
private var fftSize: Int
|
||||
private let melBandCount: Int = 64
|
||||
private let subBassUpperFreq: Float = 100.0
|
||||
private let historySize: Int = 128
|
||||
|
||||
// MARK: - FFT Setup
|
||||
|
||||
private var fftSetup: vDSP_DFT_Setup?
|
||||
private var window: [Float]
|
||||
private var realPart: [Float]
|
||||
private var imagPart: [Float]
|
||||
private var magnitudes: [Float]
|
||||
|
||||
// MARK: - Mel Filterbank
|
||||
|
||||
private var melFilterbank: [[Float]]
|
||||
private var melOutput: [Float]
|
||||
|
||||
// MARK: - Analysis State
|
||||
|
||||
private var subBassHistory: [Float]
|
||||
private var previousMagnitudes: [Float]
|
||||
private var envelopeValue: Float = 0
|
||||
private var previousEnvelope: Float = 0
|
||||
private var pumpHistory: [Float]
|
||||
private var lastPeakTime: Double = 0
|
||||
private var peakThreshold: Float = 0.3
|
||||
|
||||
// MARK: - Reactivity
|
||||
|
||||
private var reactivity: Float = 0.5
|
||||
private var smoothingFactor: Float = 0.3
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init(bufferSize: Int = 1024) {
|
||||
self.fftSize = bufferSize
|
||||
|
||||
// Initialize FFT arrays
|
||||
self.window = [Float](repeating: 0, count: fftSize)
|
||||
self.realPart = [Float](repeating: 0, count: fftSize)
|
||||
self.imagPart = [Float](repeating: 0, count: fftSize)
|
||||
self.magnitudes = [Float](repeating: 0, count: fftSize / 2)
|
||||
self.previousMagnitudes = [Float](repeating: 0, count: fftSize / 2)
|
||||
|
||||
// Initialize Mel arrays
|
||||
self.melOutput = [Float](repeating: 0, count: melBandCount)
|
||||
self.melFilterbank = []
|
||||
|
||||
// Initialize history arrays
|
||||
self.subBassHistory = [Float](repeating: 0, count: historySize)
|
||||
self.pumpHistory = [Float](repeating: 0, count: 64)
|
||||
|
||||
// Create Hann window
|
||||
vDSP_hann_window(&window, vDSP_Length(fftSize), Int32(vDSP_HANN_NORM))
|
||||
|
||||
// Create FFT setup
|
||||
fftSetup = vDSP_DFT_zop_CreateSetup(
|
||||
nil,
|
||||
vDSP_Length(fftSize),
|
||||
.FORWARD
|
||||
)
|
||||
|
||||
// Build Mel filterbank
|
||||
buildMelFilterbank()
|
||||
}
|
||||
|
||||
deinit {
|
||||
if let setup = fftSetup {
|
||||
vDSP_DFT_DestroySetup(setup)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
|
||||
/// Sets reactivity value (0.0 - 1.0)
|
||||
func setReactivity(_ value: Float) {
|
||||
reactivity = max(0.0, min(1.0, value))
|
||||
// Adjust smoothing based on reactivity (higher reactivity = less smoothing)
|
||||
smoothingFactor = 0.1 + (1.0 - reactivity) * 0.4
|
||||
}
|
||||
|
||||
/// Reconfigures for new buffer size
|
||||
func setBufferSize(_ size: Int) {
|
||||
guard size != fftSize else { return }
|
||||
|
||||
fftSize = size
|
||||
|
||||
// Reinitialize arrays
|
||||
window = [Float](repeating: 0, count: fftSize)
|
||||
realPart = [Float](repeating: 0, count: fftSize)
|
||||
imagPart = [Float](repeating: 0, count: fftSize)
|
||||
magnitudes = [Float](repeating: 0, count: fftSize / 2)
|
||||
previousMagnitudes = [Float](repeating: 0, count: fftSize / 2)
|
||||
|
||||
// Recreate window
|
||||
vDSP_hann_window(&window, vDSP_Length(fftSize), Int32(vDSP_HANN_NORM))
|
||||
|
||||
// Recreate FFT setup
|
||||
if let setup = fftSetup {
|
||||
vDSP_DFT_DestroySetup(setup)
|
||||
}
|
||||
fftSetup = vDSP_DFT_zop_CreateSetup(nil, vDSP_Length(fftSize), .FORWARD)
|
||||
|
||||
// Rebuild filterbank
|
||||
buildMelFilterbank()
|
||||
}
|
||||
|
||||
/// Processes audio buffer and returns analysis data
|
||||
func process(buffer: AVAudioPCMBuffer) -> AudioAnalysisData {
|
||||
guard let channelData = buffer.floatChannelData else {
|
||||
return .empty
|
||||
}
|
||||
|
||||
let frameCount = Int(buffer.frameLength)
|
||||
let channelCount = Int(buffer.format.channelCount)
|
||||
|
||||
// Extract stereo channels
|
||||
var leftChannel = [Float](repeating: 0, count: frameCount)
|
||||
var rightChannel = [Float](repeating: 0, count: frameCount)
|
||||
|
||||
if channelCount >= 1 {
|
||||
leftChannel = Array(UnsafeBufferPointer(start: channelData[0], count: frameCount))
|
||||
}
|
||||
if channelCount >= 2 {
|
||||
rightChannel = Array(UnsafeBufferPointer(start: channelData[1], count: frameCount))
|
||||
} else {
|
||||
rightChannel = leftChannel
|
||||
}
|
||||
|
||||
// Mix to mono for analysis
|
||||
var monoBuffer = [Float](repeating: 0, count: frameCount)
|
||||
vDSP_vadd(leftChannel, 1, rightChannel, 1, &monoBuffer, 1, vDSP_Length(frameCount))
|
||||
var half: Float = 0.5
|
||||
vDSP_vsmul(monoBuffer, 1, &half, &monoBuffer, 1, vDSP_Length(frameCount))
|
||||
|
||||
// Calculate RMS
|
||||
var rmsValue: Float = 0
|
||||
vDSP_rmsqv(monoBuffer, 1, &rmsValue, vDSP_Length(frameCount))
|
||||
|
||||
// Perform FFT
|
||||
let fftMagnitudes = performFFT(monoBuffer)
|
||||
|
||||
// Calculate Mel bands
|
||||
let melBands = calculateMelBands(from: fftMagnitudes)
|
||||
|
||||
// Extract sub-bass
|
||||
let subBassEnergy = calculateSubBassEnergy(from: fftMagnitudes)
|
||||
|
||||
// Update sub-bass history
|
||||
subBassHistory.removeFirst()
|
||||
subBassHistory.append(subBassEnergy)
|
||||
|
||||
// Calculate sidechain envelope and pump detection
|
||||
let (envelope, pumpAmount, isPumping) = detectSidechainPump(subBassEnergy: subBassEnergy)
|
||||
|
||||
// Calculate HNR
|
||||
let hnrRatio = calculateHNR(buffer: monoBuffer)
|
||||
|
||||
// Detect peaks/transients
|
||||
let (isPeak, peakIntensity) = detectPeak(rms: rmsValue)
|
||||
|
||||
// Calculate spectral centroid
|
||||
let spectralCentroid = calculateSpectralCentroid(magnitudes: fftMagnitudes)
|
||||
|
||||
return AudioAnalysisData(
|
||||
fftMagnitudes: fftMagnitudes,
|
||||
melBands: melBands,
|
||||
subBassEnergy: subBassEnergy,
|
||||
subBassHistory: subBassHistory,
|
||||
sidechainEnvelope: envelope,
|
||||
sidechainPumpAmount: pumpAmount,
|
||||
isPumping: isPumping,
|
||||
hnrRatio: hnrRatio,
|
||||
isPeak: isPeak,
|
||||
peakIntensity: peakIntensity,
|
||||
leftChannel: leftChannel,
|
||||
rightChannel: rightChannel,
|
||||
spectralCentroid: spectralCentroid,
|
||||
rmsLevel: rmsValue
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - FFT
|
||||
|
||||
private func performFFT(_ buffer: [Float]) -> [Float] {
|
||||
guard let setup = fftSetup else { return magnitudes }
|
||||
|
||||
let count = min(buffer.count, fftSize)
|
||||
|
||||
// Apply window
|
||||
var windowedBuffer = [Float](repeating: 0, count: fftSize)
|
||||
for i in 0..<count {
|
||||
windowedBuffer[i] = buffer[i] * window[i]
|
||||
}
|
||||
|
||||
// Prepare for DFT (separate into real and imaginary)
|
||||
for i in 0..<fftSize {
|
||||
realPart[i] = windowedBuffer[i]
|
||||
imagPart[i] = 0
|
||||
}
|
||||
|
||||
// Perform DFT
|
||||
var outputReal = [Float](repeating: 0, count: fftSize)
|
||||
var outputImag = [Float](repeating: 0, count: fftSize)
|
||||
|
||||
vDSP_DFT_Execute(setup, realPart, imagPart, &outputReal, &outputImag)
|
||||
|
||||
// Calculate magnitudes
|
||||
let halfSize = fftSize / 2
|
||||
var newMagnitudes = [Float](repeating: 0, count: halfSize)
|
||||
|
||||
for i in 0..<halfSize {
|
||||
let real = outputReal[i]
|
||||
let imag = outputImag[i]
|
||||
newMagnitudes[i] = sqrt(real * real + imag * imag) / Float(fftSize)
|
||||
}
|
||||
|
||||
// Apply smoothing
|
||||
for i in 0..<halfSize {
|
||||
magnitudes[i] = magnitudes[i] * smoothingFactor + newMagnitudes[i] * (1.0 - smoothingFactor)
|
||||
}
|
||||
|
||||
previousMagnitudes = magnitudes
|
||||
|
||||
return magnitudes
|
||||
}
|
||||
|
||||
// MARK: - Mel Filterbank
|
||||
|
||||
private func buildMelFilterbank() {
|
||||
let halfFFT = fftSize / 2
|
||||
let nyquist = sampleRate / 2.0
|
||||
|
||||
// Mel scale conversion
|
||||
func hzToMel(_ hz: Float) -> Float {
|
||||
return 2595.0 * log10(1.0 + hz / 700.0)
|
||||
}
|
||||
|
||||
func melToHz(_ mel: Float) -> Float {
|
||||
return 700.0 * (pow(10.0, mel / 2595.0) - 1.0)
|
||||
}
|
||||
|
||||
let melMin = hzToMel(20.0)
|
||||
let melMax = hzToMel(nyquist)
|
||||
|
||||
// Create mel points
|
||||
var melPoints = [Float](repeating: 0, count: melBandCount + 2)
|
||||
for i in 0..<melBandCount + 2 {
|
||||
melPoints[i] = melMin + Float(i) * (melMax - melMin) / Float(melBandCount + 1)
|
||||
}
|
||||
|
||||
// Convert back to Hz
|
||||
var hzPoints = melPoints.map { melToHz($0) }
|
||||
|
||||
// Convert to FFT bins
|
||||
var binPoints = hzPoints.map { Int($0 / nyquist * Float(halfFFT)) }
|
||||
|
||||
// Build triangular filters
|
||||
melFilterbank = []
|
||||
|
||||
for m in 1...melBandCount {
|
||||
var filter = [Float](repeating: 0, count: halfFFT)
|
||||
|
||||
let startBin = binPoints[m - 1]
|
||||
let centerBin = binPoints[m]
|
||||
let endBin = binPoints[m + 1]
|
||||
|
||||
// Rising edge
|
||||
for k in startBin..<centerBin {
|
||||
if centerBin != startBin {
|
||||
filter[k] = Float(k - startBin) / Float(centerBin - startBin)
|
||||
}
|
||||
}
|
||||
|
||||
// Falling edge
|
||||
for k in centerBin..<endBin {
|
||||
if endBin != centerBin {
|
||||
filter[k] = Float(endBin - k) / Float(endBin - centerBin)
|
||||
}
|
||||
}
|
||||
|
||||
melFilterbank.append(filter)
|
||||
}
|
||||
}
|
||||
|
||||
private func calculateMelBands(from magnitudes: [Float]) -> [Float] {
|
||||
var result = [Float](repeating: 0, count: melBandCount)
|
||||
|
||||
for (i, filter) in melFilterbank.enumerated() {
|
||||
var sum: Float = 0
|
||||
let count = min(filter.count, magnitudes.count)
|
||||
for j in 0..<count {
|
||||
sum += magnitudes[j] * filter[j]
|
||||
}
|
||||
// Apply logarithmic scaling
|
||||
result[i] = log10(1.0 + sum * 10.0) / log10(11.0)
|
||||
}
|
||||
|
||||
// Apply smoothing to mel output
|
||||
for i in 0..<melBandCount {
|
||||
melOutput[i] = melOutput[i] * smoothingFactor + result[i] * (1.0 - smoothingFactor)
|
||||
}
|
||||
|
||||
return melOutput
|
||||
}
|
||||
|
||||
// MARK: - Sub-Bass Analysis
|
||||
|
||||
private func calculateSubBassEnergy(from magnitudes: [Float]) -> Float {
|
||||
let binFrequency = sampleRate / Float(fftSize)
|
||||
let subBassBinCount = Int(subBassUpperFreq / binFrequency)
|
||||
|
||||
guard subBassBinCount > 0, magnitudes.count >= subBassBinCount else { return 0 }
|
||||
|
||||
var sum: Float = 0
|
||||
for i in 0..<subBassBinCount {
|
||||
sum += magnitudes[i] * magnitudes[i]
|
||||
}
|
||||
|
||||
let rms = sqrt(sum / Float(subBassBinCount))
|
||||
|
||||
// Normalize and apply gain
|
||||
let normalized = min(1.0, rms * 5.0 * (1.0 + reactivity))
|
||||
|
||||
return normalized
|
||||
}
|
||||
|
||||
// MARK: - Sidechain Pump Detection
|
||||
|
||||
private func detectSidechainPump(subBassEnergy: Float) -> (envelope: Float, pumpAmount: Float, isPumping: Bool) {
|
||||
// Envelope follower with fast attack, slow release
|
||||
let attackTime: Float = 0.005 // 5ms attack
|
||||
let releaseTime: Float = 0.15 // 150ms release
|
||||
|
||||
let attackCoeff = exp(-1.0 / (sampleRate * attackTime))
|
||||
let releaseCoeff = exp(-1.0 / (sampleRate * releaseTime))
|
||||
|
||||
if subBassEnergy > envelopeValue {
|
||||
envelopeValue = attackCoeff * envelopeValue + (1.0 - attackCoeff) * subBassEnergy
|
||||
} else {
|
||||
envelopeValue = releaseCoeff * envelopeValue + (1.0 - releaseCoeff) * subBassEnergy
|
||||
}
|
||||
|
||||
// Update pump history
|
||||
pumpHistory.removeFirst()
|
||||
pumpHistory.append(envelopeValue)
|
||||
|
||||
// Analyze pump periodicity
|
||||
var pumpAmount: Float = 0
|
||||
var isPumping = false
|
||||
|
||||
// Look for characteristic pump pattern (rise and fall)
|
||||
let derivative = envelopeValue - previousEnvelope
|
||||
previousEnvelope = envelopeValue
|
||||
|
||||
// Detect pump by finding periodic envelope variations
|
||||
if pumpHistory.count >= 32 {
|
||||
let recent = Array(pumpHistory.suffix(32))
|
||||
var variance: Float = 0
|
||||
let mean = recent.reduce(0, +) / Float(recent.count)
|
||||
|
||||
for value in recent {
|
||||
variance += (value - mean) * (value - mean)
|
||||
}
|
||||
variance /= Float(recent.count)
|
||||
|
||||
// Higher variance = more pumping
|
||||
pumpAmount = min(1.0, sqrt(variance) * 4.0)
|
||||
isPumping = pumpAmount > 0.3 && abs(derivative) > 0.02
|
||||
}
|
||||
|
||||
return (envelopeValue, pumpAmount, isPumping)
|
||||
}
|
||||
|
||||
// MARK: - HNR Calculation
|
||||
|
||||
private func calculateHNR(buffer: [Float]) -> Float {
|
||||
// Use autocorrelation to estimate harmonicity
|
||||
let frameSize = min(buffer.count, 512)
|
||||
var autocorr = [Float](repeating: 0, count: frameSize)
|
||||
|
||||
// Compute autocorrelation
|
||||
vDSP_conv(buffer, 1, buffer, 1, &autocorr, 1, vDSP_Length(frameSize), vDSP_Length(frameSize))
|
||||
|
||||
// Find the peak in autocorrelation (excluding lag 0)
|
||||
let minLag = 20 // Minimum lag to avoid DC component
|
||||
let maxLag = min(frameSize - 1, 400) // Maximum lag
|
||||
|
||||
guard maxLag > minLag else { return 0.5 }
|
||||
|
||||
var maxValue: Float = 0
|
||||
var maxIndex: vDSP_Length = 0
|
||||
|
||||
let searchRange = Array(autocorr[minLag...maxLag])
|
||||
vDSP_maxvi(searchRange, 1, &maxValue, &maxIndex, vDSP_Length(searchRange.count))
|
||||
|
||||
// Calculate HNR as ratio of peak to first value
|
||||
let noiseFloor = autocorr.suffix(from: maxLag).reduce(0) { $0 + abs($1) } / Float(frameSize - maxLag)
|
||||
|
||||
let harmonicPower = maxValue
|
||||
let noisePower = max(noiseFloor, 0.0001)
|
||||
|
||||
// Convert to 0-1 range
|
||||
let hnr = harmonicPower / (harmonicPower + noisePower)
|
||||
|
||||
return max(0.0, min(1.0, hnr))
|
||||
}
|
||||
|
||||
// MARK: - Peak Detection
|
||||
|
||||
private var previousRMS: Float = 0
|
||||
private var rmsHistory: [Float] = Array(repeating: 0, count: 16)
|
||||
|
||||
private func detectPeak(rms: Float) -> (isPeak: Bool, intensity: Float) {
|
||||
// Update history
|
||||
rmsHistory.removeFirst()
|
||||
rmsHistory.append(rms)
|
||||
|
||||
// Calculate moving average
|
||||
let average = rmsHistory.reduce(0, +) / Float(rmsHistory.count)
|
||||
|
||||
// Detect sudden increase
|
||||
let increase = rms - previousRMS
|
||||
let threshold = average * (0.5 + reactivity * 0.5)
|
||||
|
||||
previousRMS = rms
|
||||
|
||||
let isPeak = increase > threshold && rms > average * 1.5
|
||||
let intensity = isPeak ? min(1.0, increase / max(average, 0.01) * 2.0) : 0
|
||||
|
||||
return (isPeak, intensity)
|
||||
}
|
||||
|
||||
// MARK: - Spectral Centroid
|
||||
|
||||
private func calculateSpectralCentroid(magnitudes: [Float]) -> Float {
|
||||
var weightedSum: Float = 0
|
||||
var sum: Float = 0
|
||||
|
||||
for (i, mag) in magnitudes.enumerated() {
|
||||
weightedSum += Float(i) * mag
|
||||
sum += mag
|
||||
}
|
||||
|
||||
guard sum > 0 else { return 0.5 }
|
||||
|
||||
let centroid = weightedSum / sum
|
||||
let normalized = centroid / Float(magnitudes.count)
|
||||
|
||||
return max(0.0, min(1.0, normalized))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
//
|
||||
// AppSettings.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Persistent application settings
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Application settings that are persisted between sessions
|
||||
struct AppSettings: Codable {
|
||||
/// Selected audio input device UID
|
||||
var selectedAudioDeviceUID: String?
|
||||
|
||||
/// Audio buffer size (512 or 1024 samples)
|
||||
var bufferSize: Int
|
||||
|
||||
/// Last used visualization mode (1-8)
|
||||
var lastVisualizationMode: Int
|
||||
|
||||
/// Reactivity slider value (0.0 - 1.0)
|
||||
var reactivity: Float
|
||||
|
||||
/// Whether app was in fullscreen mode
|
||||
var isFullscreen: Bool
|
||||
|
||||
/// Last window frame (for restoration)
|
||||
var windowFrame: CodableRect?
|
||||
|
||||
/// Volume/gain adjustment
|
||||
var inputGain: Float
|
||||
|
||||
/// Whether to show FPS counter
|
||||
var showFPS: Bool
|
||||
|
||||
/// Default settings
|
||||
static var `default`: AppSettings {
|
||||
AppSettings(
|
||||
selectedAudioDeviceUID: nil,
|
||||
bufferSize: 1024,
|
||||
lastVisualizationMode: 1,
|
||||
reactivity: 0.5,
|
||||
isFullscreen: false,
|
||||
windowFrame: nil,
|
||||
inputGain: 1.0,
|
||||
showFPS: false
|
||||
)
|
||||
}
|
||||
|
||||
/// Available buffer sizes
|
||||
static let availableBufferSizes = [512, 1024]
|
||||
|
||||
/// Validates and clamps settings to valid ranges
|
||||
mutating func validate() {
|
||||
// Clamp buffer size to valid options
|
||||
if !AppSettings.availableBufferSizes.contains(bufferSize) {
|
||||
bufferSize = 1024
|
||||
}
|
||||
|
||||
// Clamp visualization mode
|
||||
if lastVisualizationMode < 1 || lastVisualizationMode > 8 {
|
||||
lastVisualizationMode = 1
|
||||
}
|
||||
|
||||
// Clamp reactivity
|
||||
reactivity = max(0.0, min(1.0, reactivity))
|
||||
|
||||
// Clamp input gain
|
||||
inputGain = max(0.0, min(2.0, inputGain))
|
||||
}
|
||||
}
|
||||
|
||||
/// Codable wrapper for CGRect
|
||||
struct CodableRect: Codable {
|
||||
var x: Double
|
||||
var y: Double
|
||||
var width: Double
|
||||
var height: Double
|
||||
|
||||
init(from rect: CGRect) {
|
||||
self.x = Double(rect.origin.x)
|
||||
self.y = Double(rect.origin.y)
|
||||
self.width = Double(rect.size.width)
|
||||
self.height = Double(rect.size.height)
|
||||
}
|
||||
|
||||
var cgRect: CGRect {
|
||||
CGRect(x: x, y: y, width: width, height: height)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
//
|
||||
// AudioAnalysisData.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Audio analysis data structure containing all DSP results
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Contains all audio analysis data computed by DSPEngine
|
||||
struct AudioAnalysisData {
|
||||
// MARK: - FFT Data
|
||||
|
||||
/// Raw FFT magnitude spectrum
|
||||
var fftMagnitudes: [Float]
|
||||
|
||||
// MARK: - Mel Spectrogram
|
||||
|
||||
/// 64 Mel frequency bands
|
||||
var melBands: [Float]
|
||||
|
||||
// MARK: - Sub-Bass Analysis
|
||||
|
||||
/// RMS energy below 100Hz (0.0 - 1.0)
|
||||
var subBassEnergy: Float
|
||||
|
||||
/// History buffer for time-based visualization
|
||||
var subBassHistory: [Float]
|
||||
|
||||
// MARK: - Sidechain Detection
|
||||
|
||||
/// Current envelope follower value (0.0 - 1.0)
|
||||
var sidechainEnvelope: Float
|
||||
|
||||
/// Detected pumping amount (0.0 - 1.0)
|
||||
var sidechainPumpAmount: Float
|
||||
|
||||
/// Whether pump is currently active
|
||||
var isPumping: Bool
|
||||
|
||||
// MARK: - Harmonic-to-Noise Ratio
|
||||
|
||||
/// HNR ratio (0.0 = noise, 1.0 = pure harmonic)
|
||||
var hnrRatio: Float
|
||||
|
||||
// MARK: - Transient Detection
|
||||
|
||||
/// Whether a transient peak was detected
|
||||
var isPeak: Bool
|
||||
|
||||
/// Intensity of the detected peak (0.0 - 1.0)
|
||||
var peakIntensity: Float
|
||||
|
||||
// MARK: - Stereo Channels
|
||||
|
||||
/// Left channel samples
|
||||
var leftChannel: [Float]
|
||||
|
||||
/// Right channel samples
|
||||
var rightChannel: [Float]
|
||||
|
||||
// MARK: - Additional Analysis
|
||||
|
||||
/// Spectral centroid (brightness) normalized 0.0 - 1.0
|
||||
var spectralCentroid: Float
|
||||
|
||||
/// Overall RMS level
|
||||
var rmsLevel: Float
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
/// Creates an empty AudioAnalysisData with default values
|
||||
static var empty: AudioAnalysisData {
|
||||
AudioAnalysisData(
|
||||
fftMagnitudes: [],
|
||||
melBands: Array(repeating: 0, count: 64),
|
||||
subBassEnergy: 0,
|
||||
subBassHistory: [],
|
||||
sidechainEnvelope: 0,
|
||||
sidechainPumpAmount: 0,
|
||||
isPumping: false,
|
||||
hnrRatio: 0.5,
|
||||
isPeak: false,
|
||||
peakIntensity: 0,
|
||||
leftChannel: [],
|
||||
rightChannel: [],
|
||||
spectralCentroid: 0.5,
|
||||
rmsLevel: 0
|
||||
)
|
||||
}
|
||||
|
||||
/// Creates AudioAnalysisData with specified FFT size
|
||||
static func create(fftSize: Int) -> AudioAnalysisData {
|
||||
AudioAnalysisData(
|
||||
fftMagnitudes: Array(repeating: 0, count: fftSize / 2),
|
||||
melBands: Array(repeating: 0, count: 64),
|
||||
subBassEnergy: 0,
|
||||
subBassHistory: Array(repeating: 0, count: 128),
|
||||
sidechainEnvelope: 0,
|
||||
sidechainPumpAmount: 0,
|
||||
isPumping: false,
|
||||
hnrRatio: 0.5,
|
||||
isPeak: false,
|
||||
peakIntensity: 0,
|
||||
leftChannel: [],
|
||||
rightChannel: [],
|
||||
spectralCentroid: 0.5,
|
||||
rmsLevel: 0
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
//
|
||||
// VisualizationMode.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Enumeration of all available visualization modes
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Available visualization modes, accessible via keyboard shortcuts 1-8
|
||||
enum VisualizationMode: Int, CaseIterable, Codable {
|
||||
case fftClassic = 1
|
||||
case melSpectrogram = 2
|
||||
case subBass = 3
|
||||
case sidechainPump = 4
|
||||
case hnr = 5
|
||||
case mandelbrot = 6
|
||||
case tunnelWarp = 7
|
||||
case dmtGeometry = 8
|
||||
|
||||
/// Display name for UI
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .fftClassic:
|
||||
return "FFT Classic"
|
||||
case .melSpectrogram:
|
||||
return "Mel Spektrogramm"
|
||||
case .subBass:
|
||||
return "Sub-Bass (<100Hz)"
|
||||
case .sidechainPump:
|
||||
return "Sidechain Pump"
|
||||
case .hnr:
|
||||
return "Harmonic/Noise"
|
||||
case .mandelbrot:
|
||||
return "Mandelbrot"
|
||||
case .tunnelWarp:
|
||||
return "Tunnel Warp"
|
||||
case .dmtGeometry:
|
||||
return "DMT Geometry"
|
||||
}
|
||||
}
|
||||
|
||||
/// Keyboard shortcut (1-8)
|
||||
var shortcut: String {
|
||||
return "\(self.rawValue)"
|
||||
}
|
||||
|
||||
/// Metal shader function name
|
||||
var shaderFunctionName: String {
|
||||
switch self {
|
||||
case .fftClassic:
|
||||
return "fftClassicFragment"
|
||||
case .melSpectrogram:
|
||||
return "melSpectrogramFragment"
|
||||
case .subBass:
|
||||
return "subBassFragment"
|
||||
case .sidechainPump:
|
||||
return "sidechainPumpFragment"
|
||||
case .hnr:
|
||||
return "hnrFragment"
|
||||
case .mandelbrot:
|
||||
return "mandelbrotFragment"
|
||||
case .tunnelWarp:
|
||||
return "tunnelWarpFragment"
|
||||
case .dmtGeometry:
|
||||
return "dmtGeometryFragment"
|
||||
}
|
||||
}
|
||||
|
||||
/// Description of the visualization
|
||||
var description: String {
|
||||
switch self {
|
||||
case .fftClassic:
|
||||
return "Classic frequency spectrum bars with glow effects"
|
||||
case .melSpectrogram:
|
||||
return "64-band Mel spectrogram with scrolling waterfall display"
|
||||
case .subBass:
|
||||
return "Pulsating rings visualizing sub-bass energy below 100Hz"
|
||||
case .sidechainPump:
|
||||
return "Breathing zoom effect synchronized to sidechain pumping"
|
||||
case .hnr:
|
||||
return "Harmonic vs noise visualization with geometric shapes"
|
||||
case .mandelbrot:
|
||||
return "Audio-reactive Mandelbrot fractal with zoom and color cycling"
|
||||
case .tunnelWarp:
|
||||
return "Infinite tunnel effect with warp distortion"
|
||||
case .dmtGeometry:
|
||||
return "Sacred geometry patterns: Flower of Life, Metatron's Cube, Sri Yantra"
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates mode from keyboard key code
|
||||
static func fromKeyCode(_ keyCode: UInt16) -> VisualizationMode? {
|
||||
// Key codes for 1-8 on US keyboard
|
||||
let keyCodes: [UInt16: Int] = [
|
||||
18: 1, // 1
|
||||
19: 2, // 2
|
||||
20: 3, // 3
|
||||
21: 4, // 4
|
||||
23: 5, // 5
|
||||
22: 6, // 6
|
||||
26: 7, // 7
|
||||
28: 8 // 8
|
||||
]
|
||||
|
||||
guard let modeNumber = keyCodes[keyCode] else { return nil }
|
||||
return VisualizationMode(rawValue: modeNumber)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
// swift-tools-version: 5.9
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "PsytranceVisualizer",
|
||||
platforms: [
|
||||
.macOS(.v13)
|
||||
],
|
||||
products: [
|
||||
.executable(
|
||||
name: "PsytranceVisualizer",
|
||||
targets: ["PsytranceVisualizer"]
|
||||
)
|
||||
],
|
||||
targets: [
|
||||
.executableTarget(
|
||||
name: "PsytranceVisualizer",
|
||||
path: ".",
|
||||
exclude: [
|
||||
"Package.swift",
|
||||
"README.md"
|
||||
],
|
||||
sources: [
|
||||
"App",
|
||||
"Audio",
|
||||
"Models",
|
||||
"Rendering",
|
||||
"UI",
|
||||
"Utilities"
|
||||
],
|
||||
resources: [
|
||||
.process("Resources")
|
||||
],
|
||||
swiftSettings: [
|
||||
.unsafeFlags(["-enable-bare-slash-regex"])
|
||||
]
|
||||
)
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,465 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 56;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
1100000000000001 /* PsytranceVisualizerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000001 /* PsytranceVisualizerApp.swift */; };
|
||||
1100000000000002 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000002 /* AppDelegate.swift */; };
|
||||
1100000000000003 /* AudioInputManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000003 /* AudioInputManager.swift */; };
|
||||
1100000000000004 /* DSPEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000004 /* DSPEngine.swift */; };
|
||||
1100000000000005 /* AudioAnalysisData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000005 /* AudioAnalysisData.swift */; };
|
||||
1100000000000006 /* VisualizationMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000006 /* VisualizationMode.swift */; };
|
||||
1100000000000007 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000007 /* AppSettings.swift */; };
|
||||
1100000000000008 /* MetalRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000008 /* MetalRenderer.swift */; };
|
||||
1100000000000009 /* Common.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000009 /* Common.metal */; };
|
||||
1100000000000010 /* FFTClassicShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000010 /* FFTClassicShader.metal */; };
|
||||
1100000000000011 /* MelSpectrogramShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000011 /* MelSpectrogramShader.metal */; };
|
||||
1100000000000012 /* SubBassShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000012 /* SubBassShader.metal */; };
|
||||
1100000000000013 /* SidechainPumpShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000013 /* SidechainPumpShader.metal */; };
|
||||
1100000000000014 /* HNRShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000014 /* HNRShader.metal */; };
|
||||
1100000000000015 /* MandelbrotShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000015 /* MandelbrotShader.metal */; };
|
||||
1100000000000016 /* TunnelWarpShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000016 /* TunnelWarpShader.metal */; };
|
||||
1100000000000017 /* DMTGeometryShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000017 /* DMTGeometryShader.metal */; };
|
||||
1100000000000018 /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000018 /* MainWindow.swift */; };
|
||||
1100000000000019 /* ControlPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000019 /* ControlPanel.swift */; };
|
||||
1100000000000020 /* VisualizerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000020 /* VisualizerView.swift */; };
|
||||
1100000000000021 /* SettingsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000021 /* SettingsManager.swift */; };
|
||||
1100000000000022 /* ColorPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2100000000000022 /* ColorPalette.swift */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
2000000000000001 /* PsytranceVisualizer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PsytranceVisualizer.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
2100000000000001 /* PsytranceVisualizerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PsytranceVisualizerApp.swift; sourceTree = "<group>"; };
|
||||
2100000000000002 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
2100000000000003 /* AudioInputManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioInputManager.swift; sourceTree = "<group>"; };
|
||||
2100000000000004 /* DSPEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DSPEngine.swift; sourceTree = "<group>"; };
|
||||
2100000000000005 /* AudioAnalysisData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioAnalysisData.swift; sourceTree = "<group>"; };
|
||||
2100000000000006 /* VisualizationMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisualizationMode.swift; sourceTree = "<group>"; };
|
||||
2100000000000007 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
|
||||
2100000000000008 /* MetalRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetalRenderer.swift; sourceTree = "<group>"; };
|
||||
2100000000000009 /* Common.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = Common.metal; sourceTree = "<group>"; };
|
||||
2100000000000010 /* FFTClassicShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = FFTClassicShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000011 /* MelSpectrogramShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = MelSpectrogramShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000012 /* SubBassShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = SubBassShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000013 /* SidechainPumpShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = SidechainPumpShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000014 /* HNRShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = HNRShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000015 /* MandelbrotShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = MandelbrotShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000016 /* TunnelWarpShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = TunnelWarpShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000017 /* DMTGeometryShader.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = DMTGeometryShader.metal; sourceTree = "<group>"; };
|
||||
2100000000000018 /* MainWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindow.swift; sourceTree = "<group>"; };
|
||||
2100000000000019 /* ControlPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlPanel.swift; sourceTree = "<group>"; };
|
||||
2100000000000020 /* VisualizerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisualizerView.swift; sourceTree = "<group>"; };
|
||||
2100000000000021 /* SettingsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsManager.swift; sourceTree = "<group>"; };
|
||||
2100000000000022 /* ColorPalette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorPalette.swift; sourceTree = "<group>"; };
|
||||
2100000000000023 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
2100000000000024 /* PsytranceVisualizer.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PsytranceVisualizer.entitlements; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
3000000000000001 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
4000000000000001 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
4000000000000002 /* App */,
|
||||
4000000000000003 /* Audio */,
|
||||
4000000000000004 /* Models */,
|
||||
4000000000000005 /* Rendering */,
|
||||
4000000000000007 /* UI */,
|
||||
4000000000000008 /* Utilities */,
|
||||
4000000000000009 /* Resources */,
|
||||
4000000000000010 /* Products */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000002 /* App */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000001 /* PsytranceVisualizerApp.swift */,
|
||||
2100000000000002 /* AppDelegate.swift */,
|
||||
);
|
||||
path = App;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000003 /* Audio */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000003 /* AudioInputManager.swift */,
|
||||
2100000000000004 /* DSPEngine.swift */,
|
||||
);
|
||||
path = Audio;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000004 /* Models */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000005 /* AudioAnalysisData.swift */,
|
||||
2100000000000006 /* VisualizationMode.swift */,
|
||||
2100000000000007 /* AppSettings.swift */,
|
||||
);
|
||||
path = Models;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000005 /* Rendering */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000008 /* MetalRenderer.swift */,
|
||||
4000000000000006 /* Shaders */,
|
||||
);
|
||||
path = Rendering;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000006 /* Shaders */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000009 /* Common.metal */,
|
||||
2100000000000010 /* FFTClassicShader.metal */,
|
||||
2100000000000011 /* MelSpectrogramShader.metal */,
|
||||
2100000000000012 /* SubBassShader.metal */,
|
||||
2100000000000013 /* SidechainPumpShader.metal */,
|
||||
2100000000000014 /* HNRShader.metal */,
|
||||
2100000000000015 /* MandelbrotShader.metal */,
|
||||
2100000000000016 /* TunnelWarpShader.metal */,
|
||||
2100000000000017 /* DMTGeometryShader.metal */,
|
||||
);
|
||||
path = Shaders;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000007 /* UI */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000018 /* MainWindow.swift */,
|
||||
2100000000000019 /* ControlPanel.swift */,
|
||||
2100000000000020 /* VisualizerView.swift */,
|
||||
);
|
||||
path = UI;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000008 /* Utilities */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000021 /* SettingsManager.swift */,
|
||||
2100000000000022 /* ColorPalette.swift */,
|
||||
);
|
||||
path = Utilities;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000009 /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2100000000000023 /* Info.plist */,
|
||||
2100000000000024 /* PsytranceVisualizer.entitlements */,
|
||||
);
|
||||
path = Resources;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4000000000000010 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
2000000000000001 /* PsytranceVisualizer.app */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
5000000000000001 /* PsytranceVisualizer */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 6000000000000003 /* Build configuration list for PBXNativeTarget "PsytranceVisualizer" */;
|
||||
buildPhases = (
|
||||
5000000000000002 /* Sources */,
|
||||
3000000000000001 /* Frameworks */,
|
||||
5000000000000003 /* Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = PsytranceVisualizer;
|
||||
productName = PsytranceVisualizer;
|
||||
productReference = 2000000000000001 /* PsytranceVisualizer.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
||||
/* Begin PBXProject section */
|
||||
0000000000000001 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
BuildIndependentTargetsInParallel = 1;
|
||||
LastSwiftUpdateCheck = 1500;
|
||||
LastUpgradeCheck = 1500;
|
||||
TargetAttributes = {
|
||||
5000000000000001 = {
|
||||
CreatedOnToolsVersion = 15.0;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = 6000000000000001 /* Build configuration list for PBXProject "PsytranceVisualizer" */;
|
||||
compatibilityVersion = "Xcode 14.0";
|
||||
developmentRegion = en;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
);
|
||||
mainGroup = 4000000000000001;
|
||||
productRefGroup = 4000000000000010 /* Products */;
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
5000000000000001 /* PsytranceVisualizer */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXResourcesBuildPhase section */
|
||||
5000000000000003 /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
5000000000000002 /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1100000000000001 /* PsytranceVisualizerApp.swift in Sources */,
|
||||
1100000000000002 /* AppDelegate.swift in Sources */,
|
||||
1100000000000003 /* AudioInputManager.swift in Sources */,
|
||||
1100000000000004 /* DSPEngine.swift in Sources */,
|
||||
1100000000000005 /* AudioAnalysisData.swift in Sources */,
|
||||
1100000000000006 /* VisualizationMode.swift in Sources */,
|
||||
1100000000000007 /* AppSettings.swift in Sources */,
|
||||
1100000000000008 /* MetalRenderer.swift in Sources */,
|
||||
1100000000000009 /* Common.metal in Sources */,
|
||||
1100000000000010 /* FFTClassicShader.metal in Sources */,
|
||||
1100000000000011 /* MelSpectrogramShader.metal in Sources */,
|
||||
1100000000000012 /* SubBassShader.metal in Sources */,
|
||||
1100000000000013 /* SidechainPumpShader.metal in Sources */,
|
||||
1100000000000014 /* HNRShader.metal in Sources */,
|
||||
1100000000000015 /* MandelbrotShader.metal in Sources */,
|
||||
1100000000000016 /* TunnelWarpShader.metal in Sources */,
|
||||
1100000000000017 /* DMTGeometryShader.metal in Sources */,
|
||||
1100000000000018 /* MainWindow.swift in Sources */,
|
||||
1100000000000019 /* ControlPanel.swift in Sources */,
|
||||
1100000000000020 /* VisualizerView.swift in Sources */,
|
||||
1100000000000021 /* SettingsManager.swift in Sources */,
|
||||
1100000000000022 /* ColorPalette.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
6100000000000001 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 13.0;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
6100000000000002 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 13.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
MTL_FAST_MATH = YES;
|
||||
SDKROOT = macosx;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
6100000000000003 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_ENTITLEMENTS = Resources/PsytranceVisualizer.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = Resources/Info.plist;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.music";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "Psytrance Visualizer needs access to your audio input to visualize music in real-time.";
|
||||
INFOPLIST_KEY_NSPrincipalClass = NSApplication;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.psytrance.visualizer;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
6100000000000004 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_ENTITLEMENTS = Resources/PsytranceVisualizer.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = Resources/Info.plist;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.music";
|
||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "Psytrance Visualizer needs access to your audio input to visualize music in real-time.";
|
||||
INFOPLIST_KEY_NSPrincipalClass = NSApplication;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.psytrance.visualizer;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
6000000000000001 /* Build configuration list for PBXProject "PsytranceVisualizer" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
6100000000000001 /* Debug */,
|
||||
6100000000000002 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
6000000000000003 /* Build configuration list for PBXNativeTarget "PsytranceVisualizer" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
6100000000000003 /* Debug */,
|
||||
6100000000000004 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
};
|
||||
rootObject = 0000000000000001 /* Project object */;
|
||||
}
|
||||
@@ -0,0 +1,279 @@
|
||||
//
|
||||
// MetalRenderer.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Metal-based renderer for all visualization modes
|
||||
//
|
||||
|
||||
import MetalKit
|
||||
import simd
|
||||
|
||||
/// Uniform data passed to all shaders
|
||||
struct ShaderUniforms {
|
||||
var time: Float
|
||||
var resolution: SIMD2<Float>
|
||||
var reactivity: Float
|
||||
|
||||
// Audio analysis data
|
||||
var subBassEnergy: Float
|
||||
var sidechainPump: Float
|
||||
var sidechainEnvelope: Float
|
||||
var hnrRatio: Float
|
||||
var isPeak: Float
|
||||
var peakIntensity: Float
|
||||
var spectralCentroid: Float
|
||||
var rmsLevel: Float
|
||||
|
||||
// Visualization mode (1-8)
|
||||
var mode: Int32
|
||||
|
||||
// Padding for Metal alignment
|
||||
var padding: SIMD2<Float> = .zero
|
||||
}
|
||||
|
||||
/// Metal renderer managing all visualization shaders
|
||||
final class MetalRenderer: NSObject, ObservableObject {
|
||||
// MARK: - Properties
|
||||
|
||||
private let device: MTLDevice
|
||||
private let commandQueue: MTLCommandQueue
|
||||
private var pipelineStates: [VisualizationMode: MTLRenderPipelineState] = [:]
|
||||
private var currentPipelineState: MTLRenderPipelineState?
|
||||
|
||||
@Published private(set) var currentMode: VisualizationMode = .fftClassic
|
||||
|
||||
// MARK: - Buffers
|
||||
|
||||
private var uniformBuffer: MTLBuffer?
|
||||
private var fftBuffer: MTLBuffer?
|
||||
private var melBuffer: MTLBuffer?
|
||||
private var subBassHistoryBuffer: MTLBuffer?
|
||||
|
||||
// MARK: - State
|
||||
|
||||
private var startTime: CFAbsoluteTime
|
||||
private var uniforms = ShaderUniforms(
|
||||
time: 0,
|
||||
resolution: SIMD2<Float>(1920, 1080),
|
||||
reactivity: 0.5,
|
||||
subBassEnergy: 0,
|
||||
sidechainPump: 0,
|
||||
sidechainEnvelope: 0,
|
||||
hnrRatio: 0.5,
|
||||
isPeak: 0,
|
||||
peakIntensity: 0,
|
||||
spectralCentroid: 0.5,
|
||||
rmsLevel: 0,
|
||||
mode: 1
|
||||
)
|
||||
|
||||
private var audioData: AudioAnalysisData = .empty
|
||||
|
||||
// MARK: - Constants
|
||||
|
||||
private let maxFFTSize = 1024
|
||||
private let melBandCount = 64
|
||||
private let historySize = 128
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init?(device: MTLDevice) {
|
||||
guard let queue = device.makeCommandQueue() else {
|
||||
print("[MetalRenderer] Failed to create command queue")
|
||||
return nil
|
||||
}
|
||||
|
||||
self.device = device
|
||||
self.commandQueue = queue
|
||||
self.startTime = CFAbsoluteTimeGetCurrent()
|
||||
|
||||
super.init()
|
||||
|
||||
createBuffers()
|
||||
loadShaders()
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
|
||||
/// Sets the current visualization mode
|
||||
func setVisualizationMode(_ mode: VisualizationMode) {
|
||||
currentMode = mode
|
||||
currentPipelineState = pipelineStates[mode]
|
||||
uniforms.mode = Int32(mode.rawValue)
|
||||
print("[MetalRenderer] Mode changed to: \(mode.displayName)")
|
||||
}
|
||||
|
||||
/// Updates audio analysis data
|
||||
func updateAudioData(_ data: AudioAnalysisData) {
|
||||
audioData = data
|
||||
|
||||
// Update uniforms
|
||||
uniforms.subBassEnergy = data.subBassEnergy
|
||||
uniforms.sidechainPump = data.sidechainPumpAmount
|
||||
uniforms.sidechainEnvelope = data.sidechainEnvelope
|
||||
uniforms.hnrRatio = data.hnrRatio
|
||||
uniforms.isPeak = data.isPeak ? 1.0 : 0.0
|
||||
uniforms.peakIntensity = data.peakIntensity
|
||||
uniforms.spectralCentroid = data.spectralCentroid
|
||||
uniforms.rmsLevel = data.rmsLevel
|
||||
|
||||
// Update FFT buffer
|
||||
updateFFTBuffer(data.fftMagnitudes)
|
||||
|
||||
// Update Mel buffer
|
||||
updateMelBuffer(data.melBands)
|
||||
|
||||
// Update sub-bass history buffer
|
||||
updateSubBassHistoryBuffer(data.subBassHistory)
|
||||
}
|
||||
|
||||
/// Sets reactivity value
|
||||
func setReactivity(_ value: Float) {
|
||||
uniforms.reactivity = max(0.0, min(1.0, value))
|
||||
}
|
||||
|
||||
// MARK: - Private Methods
|
||||
|
||||
private func createBuffers() {
|
||||
// Uniform buffer
|
||||
uniformBuffer = device.makeBuffer(
|
||||
length: MemoryLayout<ShaderUniforms>.stride,
|
||||
options: .storageModeShared
|
||||
)
|
||||
|
||||
// FFT magnitude buffer
|
||||
fftBuffer = device.makeBuffer(
|
||||
length: maxFFTSize * MemoryLayout<Float>.stride,
|
||||
options: .storageModeShared
|
||||
)
|
||||
|
||||
// Mel bands buffer
|
||||
melBuffer = device.makeBuffer(
|
||||
length: melBandCount * MemoryLayout<Float>.stride,
|
||||
options: .storageModeShared
|
||||
)
|
||||
|
||||
// Sub-bass history buffer
|
||||
subBassHistoryBuffer = device.makeBuffer(
|
||||
length: historySize * MemoryLayout<Float>.stride,
|
||||
options: .storageModeShared
|
||||
)
|
||||
}
|
||||
|
||||
private func updateFFTBuffer(_ magnitudes: [Float]) {
|
||||
guard let buffer = fftBuffer else { return }
|
||||
let count = min(magnitudes.count, maxFFTSize)
|
||||
memcpy(buffer.contents(), magnitudes, count * MemoryLayout<Float>.stride)
|
||||
}
|
||||
|
||||
private func updateMelBuffer(_ bands: [Float]) {
|
||||
guard let buffer = melBuffer else { return }
|
||||
let count = min(bands.count, melBandCount)
|
||||
memcpy(buffer.contents(), bands, count * MemoryLayout<Float>.stride)
|
||||
}
|
||||
|
||||
private func updateSubBassHistoryBuffer(_ history: [Float]) {
|
||||
guard let buffer = subBassHistoryBuffer else { return }
|
||||
let count = min(history.count, historySize)
|
||||
memcpy(buffer.contents(), history, count * MemoryLayout<Float>.stride)
|
||||
}
|
||||
|
||||
private func loadShaders() {
|
||||
guard let library = device.makeDefaultLibrary() else {
|
||||
print("[MetalRenderer] Failed to load shader library")
|
||||
return
|
||||
}
|
||||
|
||||
// Load vertex shader (shared)
|
||||
guard let vertexFunction = library.makeFunction(name: "vertexShader") else {
|
||||
print("[MetalRenderer] Failed to load vertex shader")
|
||||
return
|
||||
}
|
||||
|
||||
// Load all fragment shaders
|
||||
for mode in VisualizationMode.allCases {
|
||||
guard let fragmentFunction = library.makeFunction(name: mode.shaderFunctionName) else {
|
||||
print("[MetalRenderer] Failed to load shader: \(mode.shaderFunctionName)")
|
||||
continue
|
||||
}
|
||||
|
||||
let descriptor = MTLRenderPipelineDescriptor()
|
||||
descriptor.vertexFunction = vertexFunction
|
||||
descriptor.fragmentFunction = fragmentFunction
|
||||
descriptor.colorAttachments[0].pixelFormat = .bgra8Unorm
|
||||
|
||||
// Enable blending for glow effects
|
||||
descriptor.colorAttachments[0].isBlendingEnabled = true
|
||||
descriptor.colorAttachments[0].sourceRGBBlendFactor = .sourceAlpha
|
||||
descriptor.colorAttachments[0].destinationRGBBlendFactor = .oneMinusSourceAlpha
|
||||
descriptor.colorAttachments[0].sourceAlphaBlendFactor = .one
|
||||
descriptor.colorAttachments[0].destinationAlphaBlendFactor = .oneMinusSourceAlpha
|
||||
|
||||
do {
|
||||
let pipelineState = try device.makeRenderPipelineState(descriptor: descriptor)
|
||||
pipelineStates[mode] = pipelineState
|
||||
print("[MetalRenderer] Loaded shader: \(mode.displayName)")
|
||||
} catch {
|
||||
print("[MetalRenderer] Failed to create pipeline state for \(mode.displayName): \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
// Set initial pipeline state
|
||||
currentPipelineState = pipelineStates[.fftClassic]
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - MTKViewDelegate
|
||||
|
||||
extension MetalRenderer: MTKViewDelegate {
|
||||
func mtkView(_ view: MTKView, drawableSizeWillChange size: CGSize) {
|
||||
uniforms.resolution = SIMD2<Float>(Float(size.width), Float(size.height))
|
||||
}
|
||||
|
||||
func draw(in view: MTKView) {
|
||||
guard let pipelineState = currentPipelineState,
|
||||
let drawable = view.currentDrawable,
|
||||
let renderPassDescriptor = view.currentRenderPassDescriptor else {
|
||||
return
|
||||
}
|
||||
|
||||
// Update time
|
||||
uniforms.time = Float(CFAbsoluteTimeGetCurrent() - startTime)
|
||||
|
||||
// Update uniform buffer
|
||||
if let buffer = uniformBuffer {
|
||||
memcpy(buffer.contents(), &uniforms, MemoryLayout<ShaderUniforms>.stride)
|
||||
}
|
||||
|
||||
// Create command buffer
|
||||
guard let commandBuffer = commandQueue.makeCommandBuffer(),
|
||||
let renderEncoder = commandBuffer.makeRenderCommandEncoder(descriptor: renderPassDescriptor) else {
|
||||
return
|
||||
}
|
||||
|
||||
// Set pipeline state
|
||||
renderEncoder.setRenderPipelineState(pipelineState)
|
||||
|
||||
// Set buffers
|
||||
if let buffer = uniformBuffer {
|
||||
renderEncoder.setFragmentBuffer(buffer, offset: 0, index: 0)
|
||||
}
|
||||
if let buffer = fftBuffer {
|
||||
renderEncoder.setFragmentBuffer(buffer, offset: 0, index: 1)
|
||||
}
|
||||
if let buffer = melBuffer {
|
||||
renderEncoder.setFragmentBuffer(buffer, offset: 0, index: 2)
|
||||
}
|
||||
if let buffer = subBassHistoryBuffer {
|
||||
renderEncoder.setFragmentBuffer(buffer, offset: 0, index: 3)
|
||||
}
|
||||
|
||||
// Draw fullscreen quad
|
||||
renderEncoder.drawPrimitives(type: .triangleStrip, vertexStart: 0, vertexCount: 4)
|
||||
|
||||
renderEncoder.endEncoding()
|
||||
|
||||
commandBuffer.present(drawable)
|
||||
commandBuffer.commit()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,241 @@
|
||||
//
|
||||
// Common.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Shared shader functions, types, and psytrance color palette
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
// MARK: - Uniforms Structure
|
||||
|
||||
struct ShaderUniforms {
|
||||
float time;
|
||||
float2 resolution;
|
||||
float reactivity;
|
||||
|
||||
float subBassEnergy;
|
||||
float sidechainPump;
|
||||
float sidechainEnvelope;
|
||||
float hnrRatio;
|
||||
float isPeak;
|
||||
float peakIntensity;
|
||||
float spectralCentroid;
|
||||
float rmsLevel;
|
||||
|
||||
int mode;
|
||||
float2 padding;
|
||||
};
|
||||
|
||||
// MARK: - Vertex Data
|
||||
|
||||
struct VertexOut {
|
||||
float4 position [[position]];
|
||||
float2 uv;
|
||||
};
|
||||
|
||||
// MARK: - Psytrance Color Palette
|
||||
|
||||
constant float3 neonMagenta = float3(1.0, 0.0, 1.0);
|
||||
constant float3 neonCyan = float3(0.0, 1.0, 1.0);
|
||||
constant float3 neonGreen = float3(0.224, 1.0, 0.078);
|
||||
constant float3 uvViolet = float3(0.482, 0.0, 1.0);
|
||||
constant float3 hotPink = float3(1.0, 0.2, 0.6);
|
||||
constant float3 electricBlue = float3(0.0, 0.5, 1.0);
|
||||
constant float3 deepPurple = float3(0.1, 0.0, 0.15);
|
||||
|
||||
// MARK: - Palette Functions
|
||||
|
||||
inline float3 getPaletteColor(int index) {
|
||||
switch (index % 6) {
|
||||
case 0: return neonMagenta;
|
||||
case 1: return neonCyan;
|
||||
case 2: return neonGreen;
|
||||
case 3: return uvViolet;
|
||||
case 4: return hotPink;
|
||||
default: return electricBlue;
|
||||
}
|
||||
}
|
||||
|
||||
inline float3 rainbowPalette(float t) {
|
||||
float3 a = float3(0.5, 0.5, 0.5);
|
||||
float3 b = float3(0.5, 0.5, 0.5);
|
||||
float3 c = float3(1.0, 1.0, 1.0);
|
||||
float3 d = float3(0.0, 0.33, 0.67);
|
||||
return a + b * cos(6.28318 * (c * t + d));
|
||||
}
|
||||
|
||||
inline float3 psytrancePalette(float t, float time) {
|
||||
// Cycle through psytrance colors
|
||||
float phase = fract(t + time * 0.1);
|
||||
|
||||
if (phase < 0.2) {
|
||||
return mix(uvViolet, neonMagenta, phase * 5.0);
|
||||
} else if (phase < 0.4) {
|
||||
return mix(neonMagenta, hotPink, (phase - 0.2) * 5.0);
|
||||
} else if (phase < 0.6) {
|
||||
return mix(hotPink, neonCyan, (phase - 0.4) * 5.0);
|
||||
} else if (phase < 0.8) {
|
||||
return mix(neonCyan, neonGreen, (phase - 0.6) * 5.0);
|
||||
} else {
|
||||
return mix(neonGreen, uvViolet, (phase - 0.8) * 5.0);
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Heatmap for Spectrogram
|
||||
|
||||
inline float3 heatmap(float t) {
|
||||
// Low energy: dark purple
|
||||
// High energy: white through neon colors
|
||||
if (t < 0.2) {
|
||||
return mix(float3(0.05, 0.0, 0.1), uvViolet, t * 5.0);
|
||||
} else if (t < 0.4) {
|
||||
return mix(uvViolet, neonMagenta, (t - 0.2) * 5.0);
|
||||
} else if (t < 0.6) {
|
||||
return mix(neonMagenta, hotPink, (t - 0.4) * 5.0);
|
||||
} else if (t < 0.8) {
|
||||
return mix(hotPink, neonCyan, (t - 0.6) * 5.0);
|
||||
} else {
|
||||
return mix(neonCyan, float3(1.0), (t - 0.8) * 5.0);
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Noise Functions
|
||||
|
||||
// Simplex-like noise
|
||||
inline float hash(float2 p) {
|
||||
float3 p3 = fract(float3(p.xyx) * 0.1031);
|
||||
p3 += dot(p3, p3.yzx + 33.33);
|
||||
return fract((p3.x + p3.y) * p3.z);
|
||||
}
|
||||
|
||||
inline float noise(float2 p) {
|
||||
float2 i = floor(p);
|
||||
float2 f = fract(p);
|
||||
f = f * f * (3.0 - 2.0 * f);
|
||||
|
||||
float a = hash(i);
|
||||
float b = hash(i + float2(1.0, 0.0));
|
||||
float c = hash(i + float2(0.0, 1.0));
|
||||
float d = hash(i + float2(1.0, 1.0));
|
||||
|
||||
return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);
|
||||
}
|
||||
|
||||
inline float fbm(float2 p, int octaves) {
|
||||
float value = 0.0;
|
||||
float amplitude = 0.5;
|
||||
float frequency = 1.0;
|
||||
|
||||
for (int i = 0; i < octaves; i++) {
|
||||
value += amplitude * noise(p * frequency);
|
||||
frequency *= 2.0;
|
||||
amplitude *= 0.5;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
// 3D noise for volumetric effects
|
||||
inline float noise3D(float3 p) {
|
||||
float3 i = floor(p);
|
||||
float3 f = fract(p);
|
||||
f = f * f * (3.0 - 2.0 * f);
|
||||
|
||||
float2 uv = i.xy + float2(37.0, 17.0) * i.z;
|
||||
float a = hash(uv);
|
||||
float b = hash(uv + float2(1.0, 0.0));
|
||||
float c = hash(uv + float2(0.0, 1.0));
|
||||
float d = hash(uv + float2(1.0, 1.0));
|
||||
|
||||
float2 uv2 = uv + float2(37.0, 17.0);
|
||||
float e = hash(uv2);
|
||||
float ff = hash(uv2 + float2(1.0, 0.0));
|
||||
float g = hash(uv2 + float2(0.0, 1.0));
|
||||
float h = hash(uv2 + float2(1.0, 1.0));
|
||||
|
||||
float x1 = mix(mix(a, b, f.x), mix(c, d, f.x), f.y);
|
||||
float x2 = mix(mix(e, ff, f.x), mix(g, h, f.x), f.y);
|
||||
|
||||
return mix(x1, x2, f.z);
|
||||
}
|
||||
|
||||
// MARK: - Utility Functions
|
||||
|
||||
inline float2 rotate(float2 p, float angle) {
|
||||
float c = cos(angle);
|
||||
float s = sin(angle);
|
||||
return float2(p.x * c - p.y * s, p.x * s + p.y * c);
|
||||
}
|
||||
|
||||
inline float map(float value, float inMin, float inMax, float outMin, float outMax) {
|
||||
return outMin + (outMax - outMin) * (value - inMin) / (inMax - inMin);
|
||||
}
|
||||
|
||||
inline float smoothstepEdge(float edge0, float edge1, float x) {
|
||||
float t = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
|
||||
return t * t * (3.0 - 2.0 * t);
|
||||
}
|
||||
|
||||
// MARK: - Glow Effect
|
||||
|
||||
inline float3 addGlow(float3 color, float intensity, float3 glowColor) {
|
||||
return color + glowColor * intensity * intensity;
|
||||
}
|
||||
|
||||
// MARK: - SDF Functions for Geometry
|
||||
|
||||
inline float sdCircle(float2 p, float r) {
|
||||
return length(p) - r;
|
||||
}
|
||||
|
||||
inline float sdBox(float2 p, float2 b) {
|
||||
float2 d = abs(p) - b;
|
||||
return length(max(d, 0.0)) + min(max(d.x, d.y), 0.0);
|
||||
}
|
||||
|
||||
inline float sdHexagon(float2 p, float r) {
|
||||
const float3 k = float3(-0.866025404, 0.5, 0.577350269);
|
||||
p = abs(p);
|
||||
p -= 2.0 * min(dot(k.xy, p), 0.0) * k.xy;
|
||||
p -= float2(clamp(p.x, -k.z * r, k.z * r), r);
|
||||
return length(p) * sign(p.y);
|
||||
}
|
||||
|
||||
inline float sdStar(float2 p, float r, int n, float m) {
|
||||
float an = 3.141593 / float(n);
|
||||
float en = 3.141593 / m;
|
||||
float2 acs = float2(cos(an), sin(an));
|
||||
float2 ecs = float2(cos(en), sin(en));
|
||||
|
||||
float bn = fmod(atan2(p.x, p.y), 2.0 * an) - an;
|
||||
p = length(p) * float2(cos(bn), abs(sin(bn)));
|
||||
p -= r * acs;
|
||||
p += ecs * clamp(-dot(p, ecs), 0.0, r * acs.y / ecs.y);
|
||||
return length(p) * sign(p.x);
|
||||
}
|
||||
|
||||
// MARK: - Vertex Shader (Fullscreen Quad)
|
||||
|
||||
vertex VertexOut vertexShader(uint vertexID [[vertex_id]]) {
|
||||
// Generate fullscreen quad
|
||||
float2 positions[4] = {
|
||||
float2(-1.0, -1.0),
|
||||
float2( 1.0, -1.0),
|
||||
float2(-1.0, 1.0),
|
||||
float2( 1.0, 1.0)
|
||||
};
|
||||
|
||||
float2 uvs[4] = {
|
||||
float2(0.0, 1.0),
|
||||
float2(1.0, 1.0),
|
||||
float2(0.0, 0.0),
|
||||
float2(1.0, 0.0)
|
||||
};
|
||||
|
||||
VertexOut out;
|
||||
out.position = float4(positions[vertexID], 0.0, 1.0);
|
||||
out.uv = uvs[vertexID];
|
||||
return out;
|
||||
}
|
||||
@@ -0,0 +1,290 @@
|
||||
//
|
||||
// DMTGeometryShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Sacred geometry patterns: Flower of Life, Metatron's Cube, Sri Yantra, Hexagonal
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
#include "Common.metal"
|
||||
|
||||
// === SACRED GEOMETRY PRIMITIVES ===
|
||||
|
||||
// Flower of Life - overlapping circles
|
||||
float flowerOfLife(float2 p, float scale, float time) {
|
||||
p *= scale;
|
||||
|
||||
float result = 0.0;
|
||||
float circleRadius = 0.5;
|
||||
|
||||
// Center circle
|
||||
result = max(result, 1.0 - smoothstep(circleRadius - 0.02, circleRadius, length(p)));
|
||||
|
||||
// 6 circles around center
|
||||
for (int i = 0; i < 6; i++) {
|
||||
float angle = float(i) * 3.14159 / 3.0 + time * 0.1;
|
||||
float2 offset = float2(cos(angle), sin(angle)) * circleRadius;
|
||||
float d = length(p - offset);
|
||||
result = max(result, 1.0 - smoothstep(circleRadius - 0.02, circleRadius, d));
|
||||
}
|
||||
|
||||
// Second ring of 12 circles
|
||||
for (int i = 0; i < 12; i++) {
|
||||
float angle = float(i) * 3.14159 / 6.0 + time * 0.05;
|
||||
float2 offset = float2(cos(angle), sin(angle)) * circleRadius * 2.0;
|
||||
float d = length(p - offset);
|
||||
result = max(result, 0.5 * (1.0 - smoothstep(circleRadius - 0.02, circleRadius, d)));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// Metatron's Cube - 13 circles with connecting lines
|
||||
float metatronsCube(float2 p, float scale, float time) {
|
||||
p *= scale;
|
||||
|
||||
float result = 0.0;
|
||||
float nodeRadius = 0.08;
|
||||
float lineWidth = 0.01;
|
||||
|
||||
// Define the 13 points of Metatron's Cube
|
||||
float2 points[13];
|
||||
points[0] = float2(0.0, 0.0); // Center
|
||||
|
||||
// Inner hexagon
|
||||
for (int i = 0; i < 6; i++) {
|
||||
float angle = float(i) * 3.14159 / 3.0 + time * 0.1;
|
||||
points[i + 1] = float2(cos(angle), sin(angle)) * 0.5;
|
||||
}
|
||||
|
||||
// Outer hexagon (rotated)
|
||||
for (int i = 0; i < 6; i++) {
|
||||
float angle = float(i) * 3.14159 / 3.0 + 3.14159 / 6.0 + time * 0.1;
|
||||
points[i + 7] = float2(cos(angle), sin(angle)) * 0.866;
|
||||
}
|
||||
|
||||
// Draw nodes
|
||||
for (int i = 0; i < 13; i++) {
|
||||
float d = length(p - points[i]);
|
||||
float node = 1.0 - smoothstep(nodeRadius - 0.01, nodeRadius, d);
|
||||
result = max(result, node);
|
||||
}
|
||||
|
||||
// Draw connecting lines
|
||||
for (int i = 0; i < 13; i++) {
|
||||
for (int j = i + 1; j < 13; j++) {
|
||||
float2 a = points[i];
|
||||
float2 b = points[j];
|
||||
float2 pa = p - a;
|
||||
float2 ba = b - a;
|
||||
float t = clamp(dot(pa, ba) / dot(ba, ba), 0.0, 1.0);
|
||||
float d = length(pa - ba * t);
|
||||
float line = 1.0 - smoothstep(lineWidth, lineWidth + 0.005, d);
|
||||
result = max(result, line * 0.5);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// Sri Yantra - 9 interlocking triangles
|
||||
float sriYantra(float2 p, float scale, float time) {
|
||||
p *= scale;
|
||||
|
||||
float result = 0.0;
|
||||
float lineWidth = 0.015;
|
||||
|
||||
// Rotating factor
|
||||
float rot = time * 0.05;
|
||||
|
||||
// Draw 4 upward triangles
|
||||
for (int i = 0; i < 4; i++) {
|
||||
float size = 0.3 + float(i) * 0.15;
|
||||
float yOffset = -0.1 + float(i) * 0.05;
|
||||
|
||||
float2 tp = p - float2(0.0, yOffset);
|
||||
tp = rotate(tp, rot);
|
||||
|
||||
// Triangle SDF
|
||||
float2 a = float2(0.0, size);
|
||||
float2 b = float2(-size * 0.866, -size * 0.5);
|
||||
float2 c = float2(size * 0.866, -size * 0.5);
|
||||
|
||||
float d1 = dot(tp - a, normalize(float2(b.y - a.y, a.x - b.x)));
|
||||
float d2 = dot(tp - b, normalize(float2(c.y - b.y, b.x - c.x)));
|
||||
float d3 = dot(tp - c, normalize(float2(a.y - c.y, c.x - a.x)));
|
||||
|
||||
float triangleDist = max(max(d1, d2), d3);
|
||||
float edge = 1.0 - smoothstep(0.0, lineWidth, abs(triangleDist));
|
||||
result = max(result, edge * (1.0 - float(i) * 0.15));
|
||||
}
|
||||
|
||||
// Draw 5 downward triangles
|
||||
for (int i = 0; i < 5; i++) {
|
||||
float size = 0.25 + float(i) * 0.12;
|
||||
float yOffset = 0.1 - float(i) * 0.04;
|
||||
|
||||
float2 tp = p - float2(0.0, yOffset);
|
||||
tp = rotate(tp, -rot);
|
||||
|
||||
float2 a = float2(0.0, -size);
|
||||
float2 b = float2(-size * 0.866, size * 0.5);
|
||||
float2 c = float2(size * 0.866, size * 0.5);
|
||||
|
||||
float d1 = dot(tp - a, normalize(float2(b.y - a.y, a.x - b.x)));
|
||||
float d2 = dot(tp - b, normalize(float2(c.y - b.y, b.x - c.x)));
|
||||
float d3 = dot(tp - c, normalize(float2(a.y - c.y, c.x - a.x)));
|
||||
|
||||
float triangleDist = max(max(d1, d2), d3);
|
||||
float edge = 1.0 - smoothstep(0.0, lineWidth, abs(triangleDist));
|
||||
result = max(result, edge * (1.0 - float(i) * 0.12));
|
||||
}
|
||||
|
||||
// Central bindu (point)
|
||||
float bindu = 1.0 - smoothstep(0.03, 0.04, length(p));
|
||||
result = max(result, bindu);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// Hexagonal grid pattern
|
||||
float hexagonalPattern(float2 p, float scale, float time) {
|
||||
p *= scale;
|
||||
|
||||
// Hexagonal grid transformation
|
||||
float2 s = float2(1.0, 1.732);
|
||||
float2 h = s * 0.5;
|
||||
|
||||
float2 a = fmod(p, s) - h;
|
||||
float2 b = fmod(p + h, s) - h;
|
||||
|
||||
float2 gv = dot(a, a) < dot(b, b) ? a : b;
|
||||
|
||||
float hexDist = max(abs(gv.x), dot(abs(gv), normalize(float2(1.0, 1.732))));
|
||||
|
||||
float edge = 1.0 - smoothstep(0.4, 0.42, hexDist);
|
||||
float fill = smoothstep(0.38, 0.4, hexDist);
|
||||
|
||||
// Animate individual hexagons
|
||||
float2 cellId = floor(p / s);
|
||||
float cellPhase = hash(cellId + floor(time * 0.5)) * 2.0 * 3.14159;
|
||||
float pulse = 0.5 + 0.5 * sin(time * 3.0 + cellPhase);
|
||||
|
||||
return edge + fill * pulse * 0.3;
|
||||
}
|
||||
|
||||
// === MAIN FRAGMENT SHADER ===
|
||||
|
||||
fragment float4 dmtGeometryFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]],
|
||||
constant float* melData [[buffer(2)]],
|
||||
constant float* historyData [[buffer(3)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float2 resolution = uniforms.resolution;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
|
||||
float subBass = uniforms.subBassEnergy;
|
||||
float hnr = uniforms.hnrRatio;
|
||||
float peak = uniforms.isPeak;
|
||||
float peakIntensity = uniforms.peakIntensity;
|
||||
|
||||
// Aspect ratio correction
|
||||
float aspectRatio = resolution.x / resolution.y;
|
||||
float2 p = (uv - 0.5) * 2.0;
|
||||
p.x *= aspectRatio;
|
||||
|
||||
// Scale pulsing with sub-bass
|
||||
float scale = 2.0 + subBass * 0.5 * (0.5 + reactivity * 0.5);
|
||||
p *= scale;
|
||||
|
||||
// Rotation
|
||||
float rotation = time * 0.1;
|
||||
p = rotate(p, rotation);
|
||||
|
||||
// Determine which geometry to show
|
||||
// Changes on peaks or every few seconds
|
||||
float cycleTime = 8.0; // Seconds per geometry
|
||||
float cyclePhase = fmod(time, cycleTime * 4.0) / cycleTime;
|
||||
int geometryIndex = int(cyclePhase);
|
||||
|
||||
// Force change on strong peaks
|
||||
if (peak > 0.5 && peakIntensity > 0.7) {
|
||||
geometryIndex = int(fmod(float(geometryIndex) + 1.0, 4.0));
|
||||
}
|
||||
|
||||
// Calculate all geometries (for blending)
|
||||
float flower = flowerOfLife(p, 1.0, time);
|
||||
float metatron = metatronsCube(p, 1.5, time);
|
||||
float yantra = sriYantra(p, 1.2, time);
|
||||
float hexGrid = hexagonalPattern(p, 3.0, time);
|
||||
|
||||
// Select primary and secondary for blending
|
||||
float primary = 0.0;
|
||||
float secondary = 0.0;
|
||||
float blendPhase = fract(cyclePhase);
|
||||
|
||||
switch (geometryIndex) {
|
||||
case 0:
|
||||
primary = flower;
|
||||
secondary = metatron;
|
||||
break;
|
||||
case 1:
|
||||
primary = metatron;
|
||||
secondary = yantra;
|
||||
break;
|
||||
case 2:
|
||||
primary = yantra;
|
||||
secondary = hexGrid;
|
||||
break;
|
||||
default:
|
||||
primary = hexGrid;
|
||||
secondary = flower;
|
||||
break;
|
||||
}
|
||||
|
||||
// Smooth transition
|
||||
float transitionWindow = 0.2; // 20% of cycle for transition
|
||||
float blend = smoothstep(1.0 - transitionWindow, 1.0, blendPhase);
|
||||
float geometry = mix(primary, secondary, blend);
|
||||
|
||||
// Complexity based on HNR (more harmonic = more detail)
|
||||
geometry *= 0.7 + hnr * 0.3;
|
||||
|
||||
// Color based on geometry and audio
|
||||
float colorPhase = time * 0.1 + geometry * 0.5;
|
||||
float3 geometryColor = psytrancePalette(colorPhase, time);
|
||||
|
||||
// Glow intensity from peak
|
||||
float glowIntensity = 0.5 + peakIntensity * 0.5;
|
||||
float3 glowColor = mix(neonMagenta, neonCyan, 0.5 + 0.5 * sin(time));
|
||||
|
||||
// Compose final color
|
||||
float3 finalColor = geometryColor * geometry;
|
||||
|
||||
// Add glow
|
||||
finalColor = addGlow(finalColor, geometry * glowIntensity, glowColor);
|
||||
|
||||
// Background - subtle pulsing gradient
|
||||
float dist = length(uv - 0.5);
|
||||
float3 bgColor = mix(deepPurple, uvViolet * 0.3, dist);
|
||||
bgColor *= 0.8 + 0.2 * subBass;
|
||||
|
||||
finalColor = mix(bgColor, finalColor, clamp(geometry * 1.5, 0.0, 1.0));
|
||||
|
||||
// Peak flash
|
||||
if (peak > 0.5) {
|
||||
finalColor += float3(1.0) * peakIntensity * 0.2;
|
||||
}
|
||||
|
||||
// Outer glow
|
||||
float outerGlow = exp(-dist * 3.0);
|
||||
finalColor += neonMagenta * outerGlow * 0.1 * subBass;
|
||||
|
||||
return float4(finalColor, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
//
|
||||
// FFTClassicShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Classic FFT bar visualization with glow effects
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
// Include common definitions
|
||||
#include "Common.metal"
|
||||
|
||||
fragment float4 fftClassicFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float2 resolution = uniforms.resolution;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
|
||||
// Number of bars to display
|
||||
const int numBars = 64;
|
||||
const float barWidth = 1.0 / float(numBars);
|
||||
const float barGap = barWidth * 0.2;
|
||||
const float actualBarWidth = barWidth - barGap;
|
||||
|
||||
// Determine which bar this pixel belongs to
|
||||
int barIndex = int(uv.x * float(numBars));
|
||||
barIndex = clamp(barIndex, 0, numBars - 1);
|
||||
|
||||
// Get FFT magnitude for this bar (with some averaging for smoothness)
|
||||
float magnitude = fftData[barIndex];
|
||||
|
||||
// Apply reactivity scaling
|
||||
magnitude = magnitude * (0.5 + reactivity * 1.5);
|
||||
magnitude = clamp(magnitude, 0.0, 1.0);
|
||||
|
||||
// Calculate bar position within its cell
|
||||
float barCellX = fract(uv.x * float(numBars));
|
||||
float barCenterX = 0.5;
|
||||
|
||||
// Distance from bar center (for width calculation)
|
||||
float distFromCenter = abs(barCellX - barCenterX);
|
||||
float halfWidth = actualBarWidth * 0.5 / barWidth;
|
||||
|
||||
// Check if we're inside the bar horizontally
|
||||
bool insideBarX = distFromCenter < halfWidth;
|
||||
|
||||
// Bar height from bottom
|
||||
float barHeight = magnitude;
|
||||
|
||||
// Add some bounce on peaks
|
||||
if (uniforms.isPeak > 0.5) {
|
||||
barHeight += uniforms.peakIntensity * 0.1 * sin(time * 20.0 + float(barIndex) * 0.3);
|
||||
}
|
||||
|
||||
// Check if we're inside the bar vertically (from bottom)
|
||||
float yFromBottom = 1.0 - uv.y;
|
||||
bool insideBarY = yFromBottom < barHeight;
|
||||
|
||||
// Color based on frequency and magnitude
|
||||
float colorPhase = float(barIndex) / float(numBars) + time * 0.05;
|
||||
float3 barColor = psytrancePalette(colorPhase, time);
|
||||
|
||||
// Intensity gradient from bottom to top
|
||||
float intensityGradient = yFromBottom / max(barHeight, 0.01);
|
||||
intensityGradient = clamp(intensityGradient, 0.0, 1.0);
|
||||
|
||||
// Make top of bars brighter
|
||||
barColor = mix(barColor * 0.6, barColor * 1.5, intensityGradient);
|
||||
|
||||
// Calculate glow
|
||||
float glowRadius = 0.05 * (1.0 + magnitude);
|
||||
float distToBar = 0.0;
|
||||
|
||||
if (!insideBarX) {
|
||||
distToBar = (distFromCenter - halfWidth) * barWidth;
|
||||
}
|
||||
if (!insideBarY && yFromBottom >= barHeight) {
|
||||
float vertDist = yFromBottom - barHeight;
|
||||
distToBar = max(distToBar, vertDist);
|
||||
}
|
||||
|
||||
float glow = exp(-distToBar * distToBar / (glowRadius * glowRadius * 2.0));
|
||||
glow *= magnitude;
|
||||
|
||||
// Final color
|
||||
float3 finalColor = float3(0.0);
|
||||
|
||||
if (insideBarX && insideBarY) {
|
||||
// Inside the bar
|
||||
finalColor = barColor;
|
||||
|
||||
// Add peak cap (bright line at top)
|
||||
float capThickness = 0.01;
|
||||
if (abs(yFromBottom - barHeight) < capThickness) {
|
||||
finalColor = float3(1.0); // White cap
|
||||
}
|
||||
} else {
|
||||
// Add glow outside bars
|
||||
finalColor = barColor * glow * 0.5;
|
||||
}
|
||||
|
||||
// Add subtle background pulse with sub-bass
|
||||
float bgPulse = uniforms.subBassEnergy * 0.05;
|
||||
finalColor += deepPurple * bgPulse;
|
||||
|
||||
// Add overall glow at peaks
|
||||
if (uniforms.isPeak > 0.5) {
|
||||
finalColor += neonMagenta * uniforms.peakIntensity * 0.1;
|
||||
}
|
||||
|
||||
return float4(finalColor, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,142 @@
|
||||
//
|
||||
// HNRShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Harmonic-to-Noise ratio visualization with geometric shapes vs chaos
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
#include "Common.metal"
|
||||
|
||||
fragment float4 hnrFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]],
|
||||
constant float* melData [[buffer(2)]],
|
||||
constant float* historyData [[buffer(3)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float2 resolution = uniforms.resolution;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
float hnr = uniforms.hnrRatio;
|
||||
float subBass = uniforms.subBassEnergy;
|
||||
|
||||
// Center coordinates
|
||||
float2 center = float2(0.5, 0.5);
|
||||
float aspectRatio = resolution.x / resolution.y;
|
||||
|
||||
float2 p = uv - center;
|
||||
p.x *= aspectRatio;
|
||||
|
||||
float dist = length(p);
|
||||
float angle = atan2(p.y, p.x);
|
||||
|
||||
// === HARMONIC SIDE (High HNR = Clear geometric shapes) ===
|
||||
|
||||
// Rotating hexagon
|
||||
float2 rotP = rotate(p, time * 0.5);
|
||||
float hexDist = sdHexagon(rotP, 0.2 + subBass * 0.1);
|
||||
float hexEdge = 1.0 - smoothstep(0.0, 0.02, abs(hexDist));
|
||||
|
||||
// Inner rotating triangle (star)
|
||||
float2 rotP2 = rotate(p, -time * 0.3);
|
||||
float starDist = sdStar(rotP2, 0.12 + subBass * 0.05, 3, 2.5);
|
||||
float starEdge = 1.0 - smoothstep(0.0, 0.015, abs(starDist));
|
||||
|
||||
// Concentric circles
|
||||
float circles = 0.0;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
float radius = 0.1 + float(i) * 0.08 + sin(time + float(i)) * 0.02;
|
||||
float circleDist = abs(dist - radius);
|
||||
float circle = 1.0 - smoothstep(0.0, 0.008, circleDist);
|
||||
circles += circle;
|
||||
}
|
||||
|
||||
// Combine harmonic shapes
|
||||
float harmonicShapes = hexEdge + starEdge * 0.8 + circles * 0.5;
|
||||
harmonicShapes = clamp(harmonicShapes, 0.0, 1.0);
|
||||
|
||||
// Harmonic color - clean neon
|
||||
float3 harmonicColor = mix(neonCyan, neonMagenta, 0.5 + 0.5 * sin(angle * 2.0 + time));
|
||||
|
||||
// === NOISE SIDE (Low HNR = Chaotic particles) ===
|
||||
|
||||
// Noise-based particles
|
||||
float noiseField = 0.0;
|
||||
for (int i = 0; i < 5; i++) {
|
||||
float2 noiseP = p * (3.0 + float(i) * 2.0);
|
||||
noiseP += time * float(i + 1) * 0.1;
|
||||
float n = noise(noiseP);
|
||||
n = pow(n, 2.0);
|
||||
noiseField += n * (1.0 / float(i + 1));
|
||||
}
|
||||
noiseField = clamp(noiseField, 0.0, 1.0);
|
||||
|
||||
// Turbulent swirls
|
||||
float2 turbP = p * 4.0;
|
||||
float turbulence = fbm(turbP + time * 0.5, 4);
|
||||
|
||||
// Chaotic speckles
|
||||
float speckles = 0.0;
|
||||
for (int i = 0; i < 30; i++) {
|
||||
float2 specklePos = float2(
|
||||
hash(float2(float(i) * 0.1, time * 0.01)) - 0.5,
|
||||
hash(float2(float(i) * 0.2, time * 0.01 + 0.5)) - 0.5
|
||||
);
|
||||
specklePos *= 0.8;
|
||||
specklePos.x *= aspectRatio;
|
||||
|
||||
float speckleDist = length(p - specklePos);
|
||||
float speckle = exp(-speckleDist * speckleDist * 500.0);
|
||||
speckle *= hash(float2(float(i), floor(time * 2.0)));
|
||||
speckles += speckle;
|
||||
}
|
||||
|
||||
float noiseVisual = noiseField * 0.4 + turbulence * 0.3 + speckles * 0.3;
|
||||
noiseVisual = clamp(noiseVisual, 0.0, 1.0);
|
||||
|
||||
// Noise color - harsh, flickering
|
||||
float3 noiseColor = mix(hotPink, uvViolet, turbulence);
|
||||
noiseColor *= 0.8 + 0.2 * sin(time * 20.0 + noise(p * 10.0) * 10.0);
|
||||
|
||||
// === BLEND based on HNR ===
|
||||
|
||||
// HNR determines the mix: 1.0 = pure harmonic, 0.0 = pure noise
|
||||
float harmonicAmount = hnr;
|
||||
float noiseAmount = 1.0 - hnr;
|
||||
|
||||
// Apply reactivity to make transition more dramatic
|
||||
harmonicAmount = pow(harmonicAmount, 1.0 / (1.0 + reactivity));
|
||||
|
||||
float3 harmonicContrib = harmonicColor * harmonicShapes * harmonicAmount;
|
||||
float3 noiseContrib = noiseColor * noiseVisual * noiseAmount;
|
||||
|
||||
float3 finalColor = harmonicContrib + noiseContrib;
|
||||
|
||||
// Add center indicator showing current HNR
|
||||
float indicator = smoothstep(0.25, 0.24, dist) - smoothstep(0.24, 0.23, dist);
|
||||
float indicatorFill = smoothstep(0.23, 0.22, dist);
|
||||
|
||||
// Split indicator by HNR
|
||||
float harmonicSide = step(0.0, p.x);
|
||||
float noiseSide = 1.0 - harmonicSide;
|
||||
|
||||
finalColor += neonCyan * indicator * 0.3;
|
||||
finalColor += neonCyan * indicatorFill * harmonicSide * hnr * 0.2;
|
||||
finalColor += hotPink * indicatorFill * noiseSide * (1.0 - hnr) * 0.2;
|
||||
|
||||
// Background glow
|
||||
float bgGlow = exp(-dist * dist * 4.0);
|
||||
float3 bgColor = mix(deepPurple, uvViolet * 0.3, dist);
|
||||
finalColor += bgColor * (1.0 - clamp(harmonicShapes + noiseVisual, 0.0, 1.0));
|
||||
|
||||
// Peak flash
|
||||
if (uniforms.isPeak > 0.5) {
|
||||
finalColor += float3(1.0) * uniforms.peakIntensity * 0.15 * exp(-dist * 3.0);
|
||||
}
|
||||
|
||||
return float4(finalColor, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
//
|
||||
// MandelbrotShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Audio-reactive Mandelbrot fractal with zoom and color cycling
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
#include "Common.metal"
|
||||
|
||||
fragment float4 mandelbrotFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]],
|
||||
constant float* melData [[buffer(2)]],
|
||||
constant float* historyData [[buffer(3)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float2 resolution = uniforms.resolution;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
|
||||
float subBass = uniforms.subBassEnergy;
|
||||
float pump = uniforms.sidechainPump;
|
||||
float centroid = uniforms.spectralCentroid;
|
||||
|
||||
// Aspect ratio correction
|
||||
float aspectRatio = resolution.x / resolution.y;
|
||||
|
||||
// Map UV to complex plane
|
||||
float2 c = (uv - 0.5) * 2.0;
|
||||
c.x *= aspectRatio;
|
||||
|
||||
// Audio-reactive zoom level
|
||||
// Base zoom increases over time, modulated by sub-bass
|
||||
float baseZoom = 1.0 + time * 0.02;
|
||||
float audioZoom = subBass * 0.5 * (0.5 + reactivity * 0.5);
|
||||
float zoom = pow(2.0, baseZoom + audioZoom);
|
||||
|
||||
// Zoom center - drifts based on sidechain
|
||||
float2 zoomCenter = float2(-0.7, 0.0);
|
||||
zoomCenter.x += sin(time * 0.1) * 0.3 + pump * 0.1 * sin(time);
|
||||
zoomCenter.y += cos(time * 0.13) * 0.2 + pump * 0.1 * cos(time);
|
||||
|
||||
// Apply zoom
|
||||
c = c / zoom + zoomCenter;
|
||||
|
||||
// Mandelbrot iteration
|
||||
float2 z = float2(0.0);
|
||||
int maxIterations = int(50.0 + reactivity * 100.0);
|
||||
int iterations = 0;
|
||||
|
||||
float smoothIter = 0.0;
|
||||
|
||||
for (int i = 0; i < 150; i++) {
|
||||
if (i >= maxIterations) break;
|
||||
|
||||
// z = z^2 + c
|
||||
float2 zNew = float2(
|
||||
z.x * z.x - z.y * z.y + c.x,
|
||||
2.0 * z.x * z.y + c.y
|
||||
);
|
||||
z = zNew;
|
||||
|
||||
float mag2 = dot(z, z);
|
||||
if (mag2 > 256.0) {
|
||||
// Smooth iteration count
|
||||
smoothIter = float(i) - log2(log2(mag2)) + 4.0;
|
||||
break;
|
||||
}
|
||||
|
||||
iterations = i;
|
||||
}
|
||||
|
||||
// Normalize iteration count
|
||||
float normalizedIter = smoothIter / float(maxIterations);
|
||||
|
||||
// Color based on iterations
|
||||
float3 color;
|
||||
|
||||
if (iterations >= maxIterations - 1) {
|
||||
// Inside the set - deep color
|
||||
color = deepPurple * (0.5 + 0.5 * subBass);
|
||||
} else {
|
||||
// Outside - color cycling based on iterations and audio
|
||||
float colorPhase = normalizedIter + time * 0.1 + centroid;
|
||||
|
||||
// Use psytrance palette with color rotation
|
||||
color = psytrancePalette(colorPhase, time);
|
||||
|
||||
// Modulate brightness by iteration depth
|
||||
float brightness = 0.5 + 0.5 * sin(smoothIter * 0.3);
|
||||
color *= brightness;
|
||||
|
||||
// Add glow at boundary
|
||||
float edgeFactor = 1.0 - normalizedIter;
|
||||
edgeFactor = pow(edgeFactor, 3.0);
|
||||
color = addGlow(color, edgeFactor * 0.5, neonCyan);
|
||||
}
|
||||
|
||||
// Sub-bass pulse effect
|
||||
color *= 0.8 + 0.2 * subBass;
|
||||
|
||||
// Sidechain breathing
|
||||
float breathe = 1.0 + pump * 0.1;
|
||||
color *= breathe;
|
||||
|
||||
// Peak flash in bright areas
|
||||
if (uniforms.isPeak > 0.5 && iterations < maxIterations - 1) {
|
||||
color += neonMagenta * uniforms.peakIntensity * 0.2 * normalizedIter;
|
||||
}
|
||||
|
||||
// Subtle vignette
|
||||
float2 vignetteuv = uv - 0.5;
|
||||
float vignette = 1.0 - dot(vignetteuv, vignetteuv) * 0.5;
|
||||
color *= vignette;
|
||||
|
||||
return float4(color, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
//
|
||||
// MelSpectrogramShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Mel spectrogram with scrolling waterfall display
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
#include "Common.metal"
|
||||
|
||||
fragment float4 melSpectrogramFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]],
|
||||
constant float* melData [[buffer(2)]],
|
||||
constant float* historyData [[buffer(3)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
|
||||
// Configuration
|
||||
const int numBands = 64;
|
||||
const int historyLength = 128;
|
||||
|
||||
// Map UV to mel band and history position
|
||||
int bandIndex = int(uv.x * float(numBands));
|
||||
bandIndex = clamp(bandIndex, 0, numBands - 1);
|
||||
|
||||
// Scrolling effect - newer data at bottom
|
||||
float scrollOffset = fract(time * 0.5); // Scroll speed
|
||||
float yPos = fract(uv.y + scrollOffset);
|
||||
|
||||
// Get mel magnitude
|
||||
float magnitude = melData[bandIndex];
|
||||
magnitude = magnitude * (0.5 + reactivity * 1.5);
|
||||
magnitude = clamp(magnitude, 0.0, 1.0);
|
||||
|
||||
// Create waterfall effect using history
|
||||
int historyIndex = int(yPos * float(historyLength));
|
||||
historyIndex = clamp(historyIndex, 0, historyLength - 1);
|
||||
|
||||
// Combine current and historical data for waterfall
|
||||
float historicalValue = historyData[historyIndex];
|
||||
|
||||
// Blend between current magnitude and position-based intensity
|
||||
float intensity = magnitude;
|
||||
|
||||
// Add some variance based on band position
|
||||
float bandPhase = float(bandIndex) / float(numBands);
|
||||
intensity *= 0.8 + 0.2 * sin(bandPhase * 6.28318 + time);
|
||||
|
||||
// Apply fade for older data (top of screen)
|
||||
float ageFade = 1.0 - uv.y * 0.3;
|
||||
intensity *= ageFade;
|
||||
|
||||
// Generate color using heatmap
|
||||
float3 color = heatmap(intensity);
|
||||
|
||||
// Add frequency-dependent hue shift
|
||||
float hueShift = bandPhase * 0.3;
|
||||
color = psytrancePalette(intensity + hueShift, time);
|
||||
|
||||
// Modulate by actual intensity
|
||||
color *= 0.3 + intensity * 0.7;
|
||||
|
||||
// Add grid lines for visual reference
|
||||
float gridX = abs(fract(uv.x * float(numBands)) - 0.5) * 2.0;
|
||||
float gridY = abs(fract(uv.y * 16.0) - 0.5) * 2.0;
|
||||
|
||||
float gridLine = smoothstep(0.95, 1.0, gridX) + smoothstep(0.95, 1.0, gridY);
|
||||
gridLine *= 0.1;
|
||||
|
||||
color += float3(gridLine) * uvViolet;
|
||||
|
||||
// Add glow on high energy
|
||||
if (intensity > 0.7) {
|
||||
float glow = (intensity - 0.7) / 0.3;
|
||||
color = addGlow(color, glow * 0.5, neonCyan);
|
||||
}
|
||||
|
||||
// Peak flash
|
||||
if (uniforms.isPeak > 0.5) {
|
||||
color += neonMagenta * uniforms.peakIntensity * 0.15;
|
||||
}
|
||||
|
||||
// Sub-bass emphasis on lower bands
|
||||
if (bandIndex < 8) {
|
||||
color += uvViolet * uniforms.subBassEnergy * 0.3;
|
||||
}
|
||||
|
||||
return float4(color, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
//
|
||||
// SidechainPumpShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Visualizes sidechain pumping with breathing zoom effect
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
#include "Common.metal"
|
||||
|
||||
fragment float4 sidechainPumpFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]],
|
||||
constant float* melData [[buffer(2)]],
|
||||
constant float* historyData [[buffer(3)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float2 resolution = uniforms.resolution;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
|
||||
float pump = uniforms.sidechainPump;
|
||||
float envelope = uniforms.sidechainEnvelope;
|
||||
float subBass = uniforms.subBassEnergy;
|
||||
|
||||
// Center and aspect ratio correction
|
||||
float2 center = float2(0.5, 0.5);
|
||||
float aspectRatio = resolution.x / resolution.y;
|
||||
|
||||
float2 p = uv - center;
|
||||
p.x *= aspectRatio;
|
||||
|
||||
// Apply breathing zoom effect
|
||||
float zoomAmount = 1.0 + pump * 0.3 * (0.5 + reactivity * 0.5);
|
||||
p /= zoomAmount;
|
||||
|
||||
// Radial distortion synchronized with pump
|
||||
float dist = length(p);
|
||||
float angle = atan2(p.y, p.x);
|
||||
|
||||
// Pump-synced radial waves
|
||||
float radialWave = sin(dist * 15.0 - time * 3.0 + envelope * 10.0);
|
||||
radialWave *= pump * 0.3;
|
||||
|
||||
// Apply distortion
|
||||
float2 distortedP = p;
|
||||
distortedP *= 1.0 + radialWave * 0.1;
|
||||
|
||||
// Create concentric pulse rings
|
||||
float rings = 0.0;
|
||||
const int numRings = 5;
|
||||
|
||||
for (int i = 0; i < numRings; i++) {
|
||||
float ringPhase = fract(time * 0.5 + float(i) * 0.2 - envelope * 0.5);
|
||||
float ringRadius = ringPhase * 0.6;
|
||||
float ringWidth = 0.02 + pump * 0.03;
|
||||
|
||||
float ringDist = abs(dist - ringRadius);
|
||||
float ring = exp(-ringDist * ringDist / (ringWidth * ringWidth));
|
||||
ring *= 1.0 - ringPhase; // Fade out as it expands
|
||||
ring *= pump;
|
||||
|
||||
rings += ring;
|
||||
}
|
||||
|
||||
// Breathing glow in center
|
||||
float breathIntensity = 0.5 + 0.5 * sin(time * 4.0 + envelope * 6.28318);
|
||||
breathIntensity *= pump;
|
||||
|
||||
float centerGlow = exp(-dist * dist * 8.0);
|
||||
centerGlow *= breathIntensity;
|
||||
|
||||
// Color based on pump phase
|
||||
float3 pumpColor = mix(uvViolet, neonMagenta, envelope);
|
||||
float3 ringColor = mix(neonCyan, hotPink, pump);
|
||||
|
||||
// Background pattern - angular sectors that pulse
|
||||
float sectors = 8.0;
|
||||
float sectorAngle = fract(angle / (2.0 * 3.14159) * sectors);
|
||||
float sectorPulse = smoothstep(0.4, 0.5, sectorAngle) - smoothstep(0.5, 0.6, sectorAngle);
|
||||
sectorPulse *= pump * 0.3;
|
||||
sectorPulse *= exp(-dist * 3.0);
|
||||
|
||||
// Spiral pattern
|
||||
float spiral = fract(angle / (2.0 * 3.14159) * 3.0 + dist * 5.0 - time * 0.5);
|
||||
spiral = smoothstep(0.4, 0.5, spiral) - smoothstep(0.5, 0.6, spiral);
|
||||
spiral *= pump * 0.2;
|
||||
spiral *= exp(-dist * 2.0);
|
||||
|
||||
// Compose final color
|
||||
float3 finalColor = float3(0.0);
|
||||
|
||||
// Base gradient
|
||||
float3 bgGradient = mix(deepPurple, uvViolet * 0.3, dist);
|
||||
finalColor += bgGradient;
|
||||
|
||||
// Add rings
|
||||
finalColor += ringColor * rings;
|
||||
|
||||
// Add center glow
|
||||
finalColor += pumpColor * centerGlow;
|
||||
|
||||
// Add sector pulse
|
||||
finalColor += neonGreen * sectorPulse;
|
||||
|
||||
// Add spiral
|
||||
finalColor += electricBlue * spiral;
|
||||
|
||||
// Screen flash on strong pump
|
||||
if (pump > 0.7) {
|
||||
float flash = (pump - 0.7) / 0.3;
|
||||
flash *= 0.2;
|
||||
finalColor += neonMagenta * flash;
|
||||
}
|
||||
|
||||
// Peak highlight
|
||||
if (uniforms.isPeak > 0.5) {
|
||||
float peakFlash = uniforms.peakIntensity * 0.2;
|
||||
finalColor += float3(1.0) * peakFlash * exp(-dist * 5.0);
|
||||
}
|
||||
|
||||
// Vignette
|
||||
float vignette = 1.0 - smoothstep(0.4, 0.8, dist);
|
||||
finalColor *= 0.7 + vignette * 0.3;
|
||||
|
||||
return float4(finalColor, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
//
|
||||
// SubBassShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Pulsating rings visualizing sub-bass energy below 100Hz
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
#include "Common.metal"
|
||||
|
||||
fragment float4 subBassFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]],
|
||||
constant float* melData [[buffer(2)]],
|
||||
constant float* historyData [[buffer(3)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float2 resolution = uniforms.resolution;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
float subBass = uniforms.subBassEnergy;
|
||||
|
||||
// Center coordinates
|
||||
float2 center = float2(0.5, 0.5);
|
||||
float aspectRatio = resolution.x / resolution.y;
|
||||
|
||||
// Correct for aspect ratio
|
||||
float2 p = uv - center;
|
||||
p.x *= aspectRatio;
|
||||
|
||||
float dist = length(p);
|
||||
float angle = atan2(p.y, p.x);
|
||||
|
||||
// Main pulsating circle
|
||||
float baseRadius = 0.15;
|
||||
float pulseAmount = subBass * (0.5 + reactivity * 0.5);
|
||||
float mainRadius = baseRadius + pulseAmount * 0.2;
|
||||
|
||||
// Add wobble based on angle
|
||||
float wobble = sin(angle * 4.0 + time * 2.0) * 0.02 * subBass;
|
||||
mainRadius += wobble;
|
||||
|
||||
// Core circle
|
||||
float coreDist = abs(dist - mainRadius);
|
||||
float coreGlow = exp(-coreDist * coreDist * 200.0);
|
||||
|
||||
// Inner fill with gradient
|
||||
float innerFill = smoothstep(mainRadius, mainRadius * 0.3, dist);
|
||||
innerFill *= 0.5 + 0.5 * subBass;
|
||||
|
||||
// Expanding rings
|
||||
const int numRings = 6;
|
||||
float ringIntensity = 0.0;
|
||||
|
||||
for (int i = 0; i < numRings; i++) {
|
||||
// Each ring expands outward over time
|
||||
float ringPhase = fract(time * 0.3 - float(i) * 0.15);
|
||||
float ringRadius = mainRadius + ringPhase * 0.5;
|
||||
|
||||
// Get historical sub-bass value for this ring
|
||||
int histIndex = clamp(int(ringPhase * 64.0), 0, 63);
|
||||
float histValue = historyData[histIndex];
|
||||
|
||||
// Ring thickness based on historical energy
|
||||
float thickness = 0.005 + histValue * 0.01;
|
||||
float ringDist = abs(dist - ringRadius);
|
||||
|
||||
// Ring visibility
|
||||
float ring = exp(-ringDist * ringDist / (thickness * thickness));
|
||||
ring *= (1.0 - ringPhase); // Fade as it expands
|
||||
ring *= histValue; // Intensity based on history
|
||||
|
||||
ringIntensity += ring;
|
||||
}
|
||||
|
||||
// Color composition
|
||||
float3 coreColor = mix(uvViolet, neonMagenta, subBass);
|
||||
float3 ringColor = mix(neonMagenta, hotPink, 0.5 + 0.5 * sin(time));
|
||||
|
||||
float3 finalColor = float3(0.0);
|
||||
|
||||
// Add core
|
||||
finalColor += coreColor * (innerFill + coreGlow * 2.0);
|
||||
|
||||
// Add rings
|
||||
finalColor += ringColor * ringIntensity * 0.8;
|
||||
|
||||
// Add central glow
|
||||
float centerGlow = exp(-dist * dist * 10.0) * subBass;
|
||||
finalColor += uvViolet * centerGlow * 0.5;
|
||||
|
||||
// Add angular rays on peaks
|
||||
if (uniforms.isPeak > 0.5) {
|
||||
float rays = abs(sin(angle * 8.0 + time * 5.0));
|
||||
rays = pow(rays, 4.0) * exp(-dist * 2.0);
|
||||
rays *= uniforms.peakIntensity;
|
||||
finalColor += neonCyan * rays * 0.5;
|
||||
}
|
||||
|
||||
// Outer vignette
|
||||
float vignette = 1.0 - smoothstep(0.3, 0.8, dist);
|
||||
finalColor *= vignette;
|
||||
|
||||
// Background pulse
|
||||
float bgPulse = subBass * 0.1;
|
||||
finalColor += deepPurple * bgPulse;
|
||||
|
||||
// Add noise texture for organic feel
|
||||
float noiseVal = noise(p * 20.0 + time);
|
||||
finalColor += uvViolet * noiseVal * 0.02 * subBass;
|
||||
|
||||
return float4(finalColor, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
//
|
||||
// TunnelWarpShader.metal
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Infinite tunnel effect with warp distortion
|
||||
//
|
||||
|
||||
#include <metal_stdlib>
|
||||
using namespace metal;
|
||||
|
||||
#include "Common.metal"
|
||||
|
||||
fragment float4 tunnelWarpFragment(
|
||||
VertexOut in [[stage_in]],
|
||||
constant ShaderUniforms& uniforms [[buffer(0)]],
|
||||
constant float* fftData [[buffer(1)]],
|
||||
constant float* melData [[buffer(2)]],
|
||||
constant float* historyData [[buffer(3)]]
|
||||
) {
|
||||
float2 uv = in.uv;
|
||||
float2 resolution = uniforms.resolution;
|
||||
float time = uniforms.time;
|
||||
float reactivity = uniforms.reactivity;
|
||||
|
||||
float subBass = uniforms.subBassEnergy;
|
||||
float pump = uniforms.sidechainPump;
|
||||
float hnr = uniforms.hnrRatio;
|
||||
|
||||
// Center and aspect correction
|
||||
float aspectRatio = resolution.x / resolution.y;
|
||||
float2 p = (uv - 0.5) * 2.0;
|
||||
p.x *= aspectRatio;
|
||||
|
||||
// Convert to polar coordinates for tunnel
|
||||
float dist = length(p);
|
||||
float angle = atan2(p.y, p.x);
|
||||
|
||||
// Avoid division by zero at center
|
||||
dist = max(dist, 0.001);
|
||||
|
||||
// Tunnel depth (inverse of distance)
|
||||
float depth = 1.0 / dist;
|
||||
|
||||
// Speed controlled by sub-bass
|
||||
float baseSpeed = 2.0;
|
||||
float audioSpeed = subBass * 3.0 * (0.5 + reactivity * 0.5);
|
||||
float speed = baseSpeed + audioSpeed;
|
||||
|
||||
// Warp distortion from sidechain pump
|
||||
float warpAmount = pump * 0.5;
|
||||
depth += sin(angle * 4.0 + time * 2.0) * warpAmount * 0.5;
|
||||
angle += sin(depth * 2.0 + time) * warpAmount * 0.3;
|
||||
|
||||
// Create tunnel coordinates
|
||||
float2 tunnelUV = float2(
|
||||
angle / (2.0 * 3.14159) + 0.5, // Angular coordinate [0, 1]
|
||||
depth + time * speed // Depth with movement
|
||||
);
|
||||
|
||||
// === TUNNEL WALL PATTERNS ===
|
||||
|
||||
// Hexagonal grid pattern
|
||||
float2 hexUV = tunnelUV * float2(8.0, 2.0);
|
||||
float2 hexCell = floor(hexUV);
|
||||
float2 hexFrac = fract(hexUV);
|
||||
|
||||
// Offset every other row
|
||||
if (fmod(hexCell.y, 2.0) > 0.5) {
|
||||
hexFrac.x = fract(hexFrac.x + 0.5);
|
||||
}
|
||||
|
||||
float hexDist = length(hexFrac - 0.5);
|
||||
float hexPattern = smoothstep(0.4, 0.35, hexDist);
|
||||
|
||||
// Add concentric rings
|
||||
float rings = sin(tunnelUV.y * 20.0) * 0.5 + 0.5;
|
||||
rings = smoothstep(0.3, 0.7, rings);
|
||||
|
||||
// Angular segments
|
||||
float segments = 8.0;
|
||||
float angularLines = abs(sin(angle * segments));
|
||||
angularLines = smoothstep(0.95, 1.0, angularLines);
|
||||
|
||||
// Combine patterns
|
||||
float pattern = hexPattern * 0.5 + rings * 0.3 + angularLines * 0.2;
|
||||
|
||||
// === COLORING ===
|
||||
|
||||
// Base color cycles with depth and time
|
||||
float colorPhase = tunnelUV.y * 0.1 + time * 0.2;
|
||||
float3 tunnelColor = psytrancePalette(colorPhase, time);
|
||||
|
||||
// Depth fog (darker towards center/infinity)
|
||||
float fog = exp(-dist * 2.0);
|
||||
tunnelColor *= fog;
|
||||
|
||||
// Pattern overlay
|
||||
float3 patternColor = mix(uvViolet, neonCyan, rings);
|
||||
tunnelColor = mix(tunnelColor, patternColor, pattern * 0.5);
|
||||
|
||||
// Edge glow (bright at tunnel edges)
|
||||
float edgeGlow = exp(-dist * 5.0);
|
||||
tunnelColor = addGlow(tunnelColor, (1.0 - edgeGlow) * 0.3, neonMagenta);
|
||||
|
||||
// Center light (looking into the tunnel)
|
||||
float centerLight = exp(-dist * dist * 50.0);
|
||||
tunnelColor += float3(1.0) * centerLight * 0.5;
|
||||
|
||||
// HNR affects pattern complexity
|
||||
float patternIntensity = hnr;
|
||||
tunnelColor *= 0.7 + patternIntensity * 0.3;
|
||||
|
||||
// Add noise for texture
|
||||
float noiseVal = noise(tunnelUV * 10.0 + time);
|
||||
tunnelColor += uvViolet * noiseVal * 0.1;
|
||||
|
||||
// Pump flash
|
||||
if (pump > 0.5) {
|
||||
float pumpFlash = (pump - 0.5) * 2.0;
|
||||
tunnelColor += neonMagenta * pumpFlash * 0.2;
|
||||
}
|
||||
|
||||
// Peak flash
|
||||
if (uniforms.isPeak > 0.5) {
|
||||
float peakFlash = uniforms.peakIntensity;
|
||||
tunnelColor += float3(1.0) * peakFlash * 0.15 * (1.0 - edgeGlow);
|
||||
}
|
||||
|
||||
// Speed lines effect
|
||||
float speedLines = fract(tunnelUV.y * 50.0 - time * speed * 2.0);
|
||||
speedLines = smoothstep(0.95, 1.0, speedLines);
|
||||
speedLines *= subBass * 0.5;
|
||||
tunnelColor += neonCyan * speedLines;
|
||||
|
||||
return float4(tunnelColor, 1.0);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"colors" : [
|
||||
{
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "1.000",
|
||||
"green" : "0.000",
|
||||
"red" : "1.000"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "16x16"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "16x16"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "32x32"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "32x32"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "128x128"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "128x128"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "256x256"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "256x256"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "1x",
|
||||
"size" : "512x512"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"scale" : "2x",
|
||||
"size" : "512x512"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>$(MARKETING_VERSION)</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.music</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright © 2024. All rights reserved.</string>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>Psytrance Visualizer needs access to your audio input to visualize music in real-time. You can use a virtual audio device like BlackHole to route system audio.</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<true/>
|
||||
<key>NSSupportsAutomaticGraphicsSwitching</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<key>com.apple.security.device.audio-input</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,315 @@
|
||||
//
|
||||
// ControlPanel.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Auto-hiding control panel with audio and visualization settings
|
||||
//
|
||||
|
||||
import AppKit
|
||||
import Combine
|
||||
|
||||
/// Delegate protocol for control panel actions
|
||||
protocol ControlPanelDelegate: AnyObject {
|
||||
func controlPanel(_ panel: ControlPanel, didSelectDevice uid: String)
|
||||
func controlPanel(_ panel: ControlPanel, didSelectBufferSize size: Int)
|
||||
func controlPanel(_ panel: ControlPanel, didSelectMode mode: VisualizationMode)
|
||||
func controlPanel(_ panel: ControlPanel, didChangeReactivity value: Float)
|
||||
func controlPanelDidRequestFullscreen(_ panel: ControlPanel)
|
||||
}
|
||||
|
||||
/// Auto-hiding control panel overlay
|
||||
final class ControlPanel: NSView {
|
||||
// MARK: - Properties
|
||||
|
||||
weak var delegate: ControlPanelDelegate?
|
||||
|
||||
private var isVisible = true
|
||||
private var hideTimer: Timer?
|
||||
private let hideDelay: TimeInterval = 3.0
|
||||
|
||||
private var audioDevices: [AudioDevice] = []
|
||||
private var selectedMode: VisualizationMode = .fftClassic
|
||||
|
||||
// MARK: - UI Elements
|
||||
|
||||
private let containerView = NSVisualEffectView()
|
||||
private let devicePopup = NSPopUpButton()
|
||||
private let bufferSizePopup = NSPopUpButton()
|
||||
private let modeSegment = NSSegmentedControl()
|
||||
private let reactivitySlider = NSSlider()
|
||||
private let reactivityLabel = NSTextField(labelWithString: "Reactivity")
|
||||
private let fullscreenButton = NSButton()
|
||||
|
||||
// MARK: - Layout Constants
|
||||
|
||||
private let panelHeight: CGFloat = 60
|
||||
private let padding: CGFloat = 12
|
||||
private let elementHeight: CGFloat = 24
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
override init(frame frameRect: NSRect) {
|
||||
super.init(frame: frameRect)
|
||||
setupUI()
|
||||
setupConstraints()
|
||||
startHideTimer()
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
private func setupUI() {
|
||||
// Container with vibrancy effect
|
||||
containerView.material = .hudWindow
|
||||
containerView.blendingMode = .behindWindow
|
||||
containerView.state = .active
|
||||
containerView.wantsLayer = true
|
||||
containerView.layer?.cornerRadius = 12
|
||||
containerView.layer?.masksToBounds = true
|
||||
addSubview(containerView)
|
||||
|
||||
// Device popup
|
||||
devicePopup.target = self
|
||||
devicePopup.action = #selector(deviceChanged)
|
||||
devicePopup.controlSize = .small
|
||||
devicePopup.font = .systemFont(ofSize: 11)
|
||||
containerView.addSubview(devicePopup)
|
||||
|
||||
// Buffer size popup
|
||||
bufferSizePopup.target = self
|
||||
bufferSizePopup.action = #selector(bufferSizeChanged)
|
||||
bufferSizePopup.controlSize = .small
|
||||
bufferSizePopup.font = .systemFont(ofSize: 11)
|
||||
bufferSizePopup.addItems(withTitles: ["512", "1024"])
|
||||
bufferSizePopup.selectItem(withTitle: "1024")
|
||||
containerView.addSubview(bufferSizePopup)
|
||||
|
||||
// Mode segment control
|
||||
modeSegment.segmentCount = 8
|
||||
for mode in VisualizationMode.allCases {
|
||||
modeSegment.setLabel(mode.shortcut, forSegment: mode.rawValue - 1)
|
||||
modeSegment.setToolTip(mode.displayName, forSegment: mode.rawValue - 1)
|
||||
}
|
||||
modeSegment.selectedSegment = 0
|
||||
modeSegment.target = self
|
||||
modeSegment.action = #selector(modeChanged)
|
||||
modeSegment.controlSize = .small
|
||||
modeSegment.segmentStyle = .capsule
|
||||
containerView.addSubview(modeSegment)
|
||||
|
||||
// Reactivity label
|
||||
reactivityLabel.font = .systemFont(ofSize: 10)
|
||||
reactivityLabel.textColor = .secondaryLabelColor
|
||||
containerView.addSubview(reactivityLabel)
|
||||
|
||||
// Reactivity slider
|
||||
reactivitySlider.minValue = 0.0
|
||||
reactivitySlider.maxValue = 1.0
|
||||
reactivitySlider.doubleValue = 0.5
|
||||
reactivitySlider.target = self
|
||||
reactivitySlider.action = #selector(reactivityChanged)
|
||||
reactivitySlider.controlSize = .small
|
||||
containerView.addSubview(reactivitySlider)
|
||||
|
||||
// Fullscreen button
|
||||
fullscreenButton.title = "⛶"
|
||||
fullscreenButton.bezelStyle = .accessoryBarAction
|
||||
fullscreenButton.target = self
|
||||
fullscreenButton.action = #selector(fullscreenClicked)
|
||||
fullscreenButton.toolTip = "Toggle Fullscreen (F)"
|
||||
containerView.addSubview(fullscreenButton)
|
||||
|
||||
// Set colors
|
||||
applyPsytranceTheme()
|
||||
}
|
||||
|
||||
private func applyPsytranceTheme() {
|
||||
// Custom appearance for psytrance aesthetic
|
||||
containerView.appearance = NSAppearance(named: .darkAqua)
|
||||
}
|
||||
|
||||
private func setupConstraints() {
|
||||
containerView.translatesAutoresizingMaskIntoConstraints = false
|
||||
devicePopup.translatesAutoresizingMaskIntoConstraints = false
|
||||
bufferSizePopup.translatesAutoresizingMaskIntoConstraints = false
|
||||
modeSegment.translatesAutoresizingMaskIntoConstraints = false
|
||||
reactivityLabel.translatesAutoresizingMaskIntoConstraints = false
|
||||
reactivitySlider.translatesAutoresizingMaskIntoConstraints = false
|
||||
fullscreenButton.translatesAutoresizingMaskIntoConstraints = false
|
||||
|
||||
NSLayoutConstraint.activate([
|
||||
// Container
|
||||
containerView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: padding),
|
||||
containerView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -padding),
|
||||
containerView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -padding),
|
||||
containerView.heightAnchor.constraint(equalToConstant: panelHeight),
|
||||
|
||||
// Device popup
|
||||
devicePopup.leadingAnchor.constraint(equalTo: containerView.leadingAnchor, constant: padding),
|
||||
devicePopup.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
|
||||
devicePopup.widthAnchor.constraint(equalToConstant: 150),
|
||||
|
||||
// Buffer size popup
|
||||
bufferSizePopup.leadingAnchor.constraint(equalTo: devicePopup.trailingAnchor, constant: 8),
|
||||
bufferSizePopup.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
|
||||
bufferSizePopup.widthAnchor.constraint(equalToConstant: 60),
|
||||
|
||||
// Mode segment
|
||||
modeSegment.centerXAnchor.constraint(equalTo: containerView.centerXAnchor),
|
||||
modeSegment.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
|
||||
|
||||
// Reactivity label
|
||||
reactivityLabel.trailingAnchor.constraint(equalTo: reactivitySlider.leadingAnchor, constant: -4),
|
||||
reactivityLabel.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
|
||||
|
||||
// Reactivity slider
|
||||
reactivitySlider.trailingAnchor.constraint(equalTo: fullscreenButton.leadingAnchor, constant: -padding),
|
||||
reactivitySlider.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
|
||||
reactivitySlider.widthAnchor.constraint(equalToConstant: 80),
|
||||
|
||||
// Fullscreen button
|
||||
fullscreenButton.trailingAnchor.constraint(equalTo: containerView.trailingAnchor, constant: -padding),
|
||||
fullscreenButton.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
|
||||
])
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
|
||||
/// Updates the list of available audio devices
|
||||
func updateDevices(_ devices: [AudioDevice], selectedUID: String?) {
|
||||
audioDevices = devices
|
||||
devicePopup.removeAllItems()
|
||||
|
||||
for device in devices {
|
||||
devicePopup.addItem(withTitle: device.name)
|
||||
devicePopup.lastItem?.representedObject = device.uid
|
||||
}
|
||||
|
||||
if let uid = selectedUID,
|
||||
let index = devices.firstIndex(where: { $0.uid == uid }) {
|
||||
devicePopup.selectItem(at: index)
|
||||
}
|
||||
}
|
||||
|
||||
/// Updates the selected buffer size
|
||||
func updateBufferSize(_ size: Int) {
|
||||
bufferSizePopup.selectItem(withTitle: "\(size)")
|
||||
}
|
||||
|
||||
/// Updates the selected visualization mode
|
||||
func updateMode(_ mode: VisualizationMode) {
|
||||
selectedMode = mode
|
||||
modeSegment.selectedSegment = mode.rawValue - 1
|
||||
}
|
||||
|
||||
/// Updates the reactivity slider
|
||||
func updateReactivity(_ value: Float) {
|
||||
reactivitySlider.doubleValue = Double(value)
|
||||
}
|
||||
|
||||
/// Shows the control panel
|
||||
func show(animated: Bool = true) {
|
||||
guard !isVisible else { return }
|
||||
isVisible = true
|
||||
|
||||
if animated {
|
||||
NSAnimationContext.runAnimationGroup { context in
|
||||
context.duration = 0.3
|
||||
self.animator().alphaValue = 1.0
|
||||
}
|
||||
} else {
|
||||
alphaValue = 1.0
|
||||
}
|
||||
|
||||
startHideTimer()
|
||||
}
|
||||
|
||||
/// Hides the control panel
|
||||
func hide(animated: Bool = true) {
|
||||
guard isVisible else { return }
|
||||
isVisible = false
|
||||
hideTimer?.invalidate()
|
||||
|
||||
if animated {
|
||||
NSAnimationContext.runAnimationGroup { context in
|
||||
context.duration = 0.3
|
||||
self.animator().alphaValue = 0.0
|
||||
}
|
||||
} else {
|
||||
alphaValue = 0.0
|
||||
}
|
||||
}
|
||||
|
||||
/// Resets the hide timer (call on mouse movement)
|
||||
func resetHideTimer() {
|
||||
show()
|
||||
startHideTimer()
|
||||
}
|
||||
|
||||
// MARK: - Private Methods
|
||||
|
||||
private func startHideTimer() {
|
||||
hideTimer?.invalidate()
|
||||
hideTimer = Timer.scheduledTimer(withTimeInterval: hideDelay, repeats: false) { [weak self] _ in
|
||||
self?.hide()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
@objc private func deviceChanged() {
|
||||
guard let uid = devicePopup.selectedItem?.representedObject as? String else { return }
|
||||
delegate?.controlPanel(self, didSelectDevice: uid)
|
||||
}
|
||||
|
||||
@objc private func bufferSizeChanged() {
|
||||
guard let title = bufferSizePopup.selectedItem?.title,
|
||||
let size = Int(title) else { return }
|
||||
delegate?.controlPanel(self, didSelectBufferSize: size)
|
||||
}
|
||||
|
||||
@objc private func modeChanged() {
|
||||
let modeIndex = modeSegment.selectedSegment + 1
|
||||
guard let mode = VisualizationMode(rawValue: modeIndex) else { return }
|
||||
selectedMode = mode
|
||||
delegate?.controlPanel(self, didSelectMode: mode)
|
||||
}
|
||||
|
||||
@objc private func reactivityChanged() {
|
||||
let value = Float(reactivitySlider.doubleValue)
|
||||
delegate?.controlPanel(self, didChangeReactivity: value)
|
||||
}
|
||||
|
||||
@objc private func fullscreenClicked() {
|
||||
delegate?.controlPanelDidRequestFullscreen(self)
|
||||
}
|
||||
|
||||
// MARK: - Mouse Tracking
|
||||
|
||||
override func updateTrackingAreas() {
|
||||
super.updateTrackingAreas()
|
||||
|
||||
// Remove existing tracking areas
|
||||
for area in trackingAreas {
|
||||
removeTrackingArea(area)
|
||||
}
|
||||
|
||||
// Add new tracking area
|
||||
let options: NSTrackingArea.Options = [.mouseEnteredAndExited, .mouseMoved, .activeAlways]
|
||||
let trackingArea = NSTrackingArea(rect: bounds, options: options, owner: self, userInfo: nil)
|
||||
addTrackingArea(trackingArea)
|
||||
}
|
||||
|
||||
override func mouseMoved(with event: NSEvent) {
|
||||
super.mouseMoved(with: event)
|
||||
resetHideTimer()
|
||||
}
|
||||
|
||||
override func mouseEntered(with event: NSEvent) {
|
||||
super.mouseEntered(with: event)
|
||||
show()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,323 @@
|
||||
//
|
||||
// MainWindow.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Main application window with keyboard handling
|
||||
//
|
||||
|
||||
import AppKit
|
||||
import Combine
|
||||
|
||||
/// Main window controller for the visualizer
|
||||
final class MainWindowController: NSWindowController {
|
||||
// MARK: - Properties
|
||||
|
||||
private var visualizerView: VisualizerView!
|
||||
private var controlPanel: ControlPanel!
|
||||
|
||||
private var audioManager: AudioInputManager!
|
||||
private var dspEngine: DSPEngine!
|
||||
private var settingsManager: SettingsManager { .shared }
|
||||
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
private var displayLink: CVDisplayLink?
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
convenience init() {
|
||||
let window = NSWindow(
|
||||
contentRect: NSRect(x: 0, y: 0, width: 1280, height: 720),
|
||||
styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
|
||||
backing: .buffered,
|
||||
defer: false
|
||||
)
|
||||
|
||||
window.title = "Psytrance Visualizer"
|
||||
window.minSize = NSSize(width: 800, height: 600)
|
||||
window.titlebarAppearsTransparent = true
|
||||
window.titleVisibility = .hidden
|
||||
window.isMovableByWindowBackground = true
|
||||
window.backgroundColor = .black
|
||||
window.collectionBehavior = [.fullScreenPrimary]
|
||||
|
||||
// Restore window frame if saved
|
||||
if let savedFrame = SettingsManager.shared.settings.windowFrame?.cgRect {
|
||||
window.setFrame(savedFrame, display: false)
|
||||
} else {
|
||||
window.center()
|
||||
}
|
||||
|
||||
self.init(window: window)
|
||||
|
||||
setupContent()
|
||||
setupAudio()
|
||||
setupKeyboardHandling()
|
||||
restoreSettings()
|
||||
}
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
private func setupContent() {
|
||||
guard let contentView = window?.contentView else { return }
|
||||
|
||||
// Visualizer view (fills entire window)
|
||||
visualizerView = VisualizerView()
|
||||
visualizerView.translatesAutoresizingMaskIntoConstraints = false
|
||||
contentView.addSubview(visualizerView)
|
||||
|
||||
// Control panel (overlay at bottom)
|
||||
controlPanel = ControlPanel()
|
||||
controlPanel.translatesAutoresizingMaskIntoConstraints = false
|
||||
controlPanel.delegate = self
|
||||
contentView.addSubview(controlPanel)
|
||||
|
||||
NSLayoutConstraint.activate([
|
||||
// Visualizer fills entire window
|
||||
visualizerView.topAnchor.constraint(equalTo: contentView.topAnchor),
|
||||
visualizerView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
|
||||
visualizerView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
|
||||
visualizerView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
|
||||
|
||||
// Control panel at bottom
|
||||
controlPanel.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
|
||||
controlPanel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
|
||||
controlPanel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
|
||||
controlPanel.heightAnchor.constraint(equalToConstant: 90),
|
||||
])
|
||||
|
||||
// Mouse tracking for control panel
|
||||
setupMouseTracking()
|
||||
}
|
||||
|
||||
private func setupAudio() {
|
||||
audioManager = AudioInputManager()
|
||||
dspEngine = DSPEngine(bufferSize: settingsManager.settings.bufferSize)
|
||||
|
||||
// Audio buffer callback
|
||||
audioManager.onAudioBuffer = { [weak self] buffer in
|
||||
guard let self = self else { return }
|
||||
let analysisData = self.dspEngine.process(buffer: buffer)
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.visualizerView.updateAudioData(analysisData)
|
||||
}
|
||||
}
|
||||
|
||||
// Update control panel when devices change
|
||||
audioManager.$availableDevices
|
||||
.receive(on: DispatchQueue.main)
|
||||
.sink { [weak self] devices in
|
||||
self?.controlPanel.updateDevices(
|
||||
devices,
|
||||
selectedUID: self?.settingsManager.settings.selectedAudioDeviceUID
|
||||
)
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
|
||||
// Start audio
|
||||
audioManager.start()
|
||||
}
|
||||
|
||||
private func setupKeyboardHandling() {
|
||||
// Monitor for key events
|
||||
NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
|
||||
if self?.handleKeyDown(event) == true {
|
||||
return nil // Event handled
|
||||
}
|
||||
return event
|
||||
}
|
||||
}
|
||||
|
||||
private func setupMouseTracking() {
|
||||
guard let contentView = window?.contentView else { return }
|
||||
|
||||
let options: NSTrackingArea.Options = [.mouseMoved, .activeAlways, .inVisibleRect]
|
||||
let trackingArea = NSTrackingArea(
|
||||
rect: contentView.bounds,
|
||||
options: options,
|
||||
owner: self,
|
||||
userInfo: nil
|
||||
)
|
||||
contentView.addTrackingArea(trackingArea)
|
||||
}
|
||||
|
||||
private func restoreSettings() {
|
||||
let settings = settingsManager.settings
|
||||
|
||||
// Restore visualization mode
|
||||
if let mode = VisualizationMode(rawValue: settings.lastVisualizationMode) {
|
||||
visualizerView.setVisualizationMode(mode)
|
||||
controlPanel.updateMode(mode)
|
||||
}
|
||||
|
||||
// Restore reactivity
|
||||
visualizerView.setReactivity(settings.reactivity)
|
||||
dspEngine.setReactivity(settings.reactivity)
|
||||
controlPanel.updateReactivity(settings.reactivity)
|
||||
|
||||
// Restore buffer size
|
||||
dspEngine.setBufferSize(settings.bufferSize)
|
||||
audioManager.setBufferSize(settings.bufferSize)
|
||||
controlPanel.updateBufferSize(settings.bufferSize)
|
||||
|
||||
// Restore audio device
|
||||
if let deviceUID = settings.selectedAudioDeviceUID {
|
||||
audioManager.selectDevice(uid: deviceUID)
|
||||
}
|
||||
|
||||
// Restore fullscreen state
|
||||
if settings.isFullscreen {
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
|
||||
self?.window?.toggleFullScreen(nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Keyboard Handling
|
||||
|
||||
private func handleKeyDown(_ event: NSEvent) -> Bool {
|
||||
// Check for visualization mode shortcuts (1-8)
|
||||
if let mode = VisualizationMode.fromKeyCode(event.keyCode) {
|
||||
setVisualizationMode(mode)
|
||||
return true
|
||||
}
|
||||
|
||||
// Other keyboard shortcuts
|
||||
switch event.keyCode {
|
||||
case 3: // F key
|
||||
toggleFullscreen()
|
||||
return true
|
||||
case 53: // Escape
|
||||
if window?.styleMask.contains(.fullScreen) == true {
|
||||
window?.toggleFullScreen(nil)
|
||||
}
|
||||
return true
|
||||
case 49: // Space
|
||||
// Toggle pause (could be implemented)
|
||||
return true
|
||||
default:
|
||||
break
|
||||
}
|
||||
|
||||
// Cmd+F for fullscreen
|
||||
if event.modifierFlags.contains(.command) && event.keyCode == 3 {
|
||||
toggleFullscreen()
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// MARK: - Mode Switching
|
||||
|
||||
private func setVisualizationMode(_ mode: VisualizationMode) {
|
||||
visualizerView.setVisualizationMode(mode)
|
||||
controlPanel.updateMode(mode)
|
||||
settingsManager.setVisualizationMode(mode)
|
||||
}
|
||||
|
||||
// MARK: - Fullscreen
|
||||
|
||||
private func toggleFullscreen() {
|
||||
window?.toggleFullScreen(nil)
|
||||
}
|
||||
|
||||
// MARK: - Mouse Events
|
||||
|
||||
override func mouseMoved(with event: NSEvent) {
|
||||
controlPanel.resetHideTimer()
|
||||
}
|
||||
|
||||
// MARK: - Window Events
|
||||
|
||||
override func windowDidLoad() {
|
||||
super.windowDidLoad()
|
||||
|
||||
// Save window frame on move/resize
|
||||
NotificationCenter.default.addObserver(
|
||||
self,
|
||||
selector: #selector(windowDidResize),
|
||||
name: NSWindow.didResizeNotification,
|
||||
object: window
|
||||
)
|
||||
|
||||
NotificationCenter.default.addObserver(
|
||||
self,
|
||||
selector: #selector(windowDidMove),
|
||||
name: NSWindow.didMoveNotification,
|
||||
object: window
|
||||
)
|
||||
|
||||
NotificationCenter.default.addObserver(
|
||||
self,
|
||||
selector: #selector(windowDidEnterFullScreen),
|
||||
name: NSWindow.didEnterFullScreenNotification,
|
||||
object: window
|
||||
)
|
||||
|
||||
NotificationCenter.default.addObserver(
|
||||
self,
|
||||
selector: #selector(windowDidExitFullScreen),
|
||||
name: NSWindow.didExitFullScreenNotification,
|
||||
object: window
|
||||
)
|
||||
}
|
||||
|
||||
@objc private func windowDidResize(_ notification: Notification) {
|
||||
if let frame = window?.frame {
|
||||
settingsManager.setWindowFrame(frame)
|
||||
}
|
||||
}
|
||||
|
||||
@objc private func windowDidMove(_ notification: Notification) {
|
||||
if let frame = window?.frame {
|
||||
settingsManager.setWindowFrame(frame)
|
||||
}
|
||||
}
|
||||
|
||||
@objc private func windowDidEnterFullScreen(_ notification: Notification) {
|
||||
settingsManager.setFullscreen(true)
|
||||
controlPanel.hide()
|
||||
}
|
||||
|
||||
@objc private func windowDidExitFullScreen(_ notification: Notification) {
|
||||
settingsManager.setFullscreen(false)
|
||||
controlPanel.show()
|
||||
}
|
||||
|
||||
// MARK: - Cleanup
|
||||
|
||||
deinit {
|
||||
audioManager.stop()
|
||||
settingsManager.saveNow()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - ControlPanelDelegate
|
||||
|
||||
extension MainWindowController: ControlPanelDelegate {
|
||||
func controlPanel(_ panel: ControlPanel, didSelectDevice uid: String) {
|
||||
audioManager.selectDevice(uid: uid)
|
||||
settingsManager.setAudioDevice(uid: uid)
|
||||
}
|
||||
|
||||
func controlPanel(_ panel: ControlPanel, didSelectBufferSize size: Int) {
|
||||
audioManager.setBufferSize(size)
|
||||
dspEngine.setBufferSize(size)
|
||||
settingsManager.setBufferSize(size)
|
||||
}
|
||||
|
||||
func controlPanel(_ panel: ControlPanel, didSelectMode mode: VisualizationMode) {
|
||||
setVisualizationMode(mode)
|
||||
}
|
||||
|
||||
func controlPanel(_ panel: ControlPanel, didChangeReactivity value: Float) {
|
||||
visualizerView.setReactivity(value)
|
||||
dspEngine.setReactivity(value)
|
||||
settingsManager.setReactivity(value)
|
||||
}
|
||||
|
||||
func controlPanelDidRequestFullscreen(_ panel: ControlPanel) {
|
||||
toggleFullscreen()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
//
|
||||
// VisualizerView.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// MTKView subclass for rendering visualizations
|
||||
//
|
||||
|
||||
import MetalKit
|
||||
import Combine
|
||||
|
||||
/// MTKView subclass that displays audio-reactive visualizations
|
||||
final class VisualizerView: MTKView {
|
||||
// MARK: - Properties
|
||||
|
||||
private var renderer: MetalRenderer?
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
// Get default Metal device
|
||||
guard let device = MTLCreateSystemDefaultDevice() else {
|
||||
fatalError("Metal is not supported on this device")
|
||||
}
|
||||
|
||||
super.init(frame: .zero, device: device)
|
||||
|
||||
configure()
|
||||
setupRenderer()
|
||||
}
|
||||
|
||||
required init(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Configuration
|
||||
|
||||
private func configure() {
|
||||
// Background color
|
||||
clearColor = MTLClearColor(red: 0, green: 0, blue: 0, alpha: 1)
|
||||
|
||||
// Color format
|
||||
colorPixelFormat = .bgra8Unorm
|
||||
|
||||
// Enable display link for smooth rendering
|
||||
isPaused = false
|
||||
enableSetNeedsDisplay = false
|
||||
|
||||
// Use display refresh rate
|
||||
preferredFramesPerSecond = 120 // Will cap to display refresh
|
||||
|
||||
// Layer configuration
|
||||
layer?.isOpaque = true
|
||||
|
||||
// Allow high DPI
|
||||
layer?.contentsScale = NSScreen.main?.backingScaleFactor ?? 2.0
|
||||
}
|
||||
|
||||
private func setupRenderer() {
|
||||
guard let device = device else { return }
|
||||
|
||||
renderer = MetalRenderer(device: device)
|
||||
delegate = renderer
|
||||
|
||||
// Initial size update
|
||||
if let renderer = renderer {
|
||||
let size = drawableSize
|
||||
renderer.mtkView(self, drawableSizeWillChange: size)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
|
||||
/// Returns the Metal renderer
|
||||
func getRenderer() -> MetalRenderer? {
|
||||
return renderer
|
||||
}
|
||||
|
||||
/// Updates audio data for visualization
|
||||
func updateAudioData(_ data: AudioAnalysisData) {
|
||||
renderer?.updateAudioData(data)
|
||||
}
|
||||
|
||||
/// Sets the visualization mode
|
||||
func setVisualizationMode(_ mode: VisualizationMode) {
|
||||
renderer?.setVisualizationMode(mode)
|
||||
}
|
||||
|
||||
/// Sets reactivity value
|
||||
func setReactivity(_ value: Float) {
|
||||
renderer?.setReactivity(value)
|
||||
}
|
||||
|
||||
/// Gets current visualization mode
|
||||
var currentMode: VisualizationMode {
|
||||
renderer?.currentMode ?? .fftClassic
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - SwiftUI Bridge
|
||||
|
||||
#if canImport(SwiftUI)
|
||||
import SwiftUI
|
||||
|
||||
/// SwiftUI wrapper for VisualizerView
|
||||
struct VisualizerViewRepresentable: NSViewRepresentable {
|
||||
@Binding var audioData: AudioAnalysisData
|
||||
@Binding var mode: VisualizationMode
|
||||
@Binding var reactivity: Float
|
||||
|
||||
func makeNSView(context: Context) -> VisualizerView {
|
||||
let view = VisualizerView()
|
||||
return view
|
||||
}
|
||||
|
||||
func updateNSView(_ nsView: VisualizerView, context: Context) {
|
||||
nsView.updateAudioData(audioData)
|
||||
nsView.setVisualizationMode(mode)
|
||||
nsView.setReactivity(reactivity)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,140 @@
|
||||
//
|
||||
// ColorPalette.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Psytrance color palette for UI and shaders
|
||||
//
|
||||
|
||||
import AppKit
|
||||
import simd
|
||||
|
||||
/// Psytrance-inspired neon/UV color palette
|
||||
struct PsytranceColors {
|
||||
// MARK: - Primary Colors (NSColor for UI)
|
||||
|
||||
/// Neon Magenta - Primary accent color
|
||||
static let neonMagenta = NSColor(red: 1.0, green: 0.0, blue: 1.0, alpha: 1.0)
|
||||
|
||||
/// Neon Cyan - Secondary accent color
|
||||
static let neonCyan = NSColor(red: 0.0, green: 1.0, blue: 1.0, alpha: 1.0)
|
||||
|
||||
/// Neon Green - High energy accents
|
||||
static let neonGreen = NSColor(red: 0.224, green: 1.0, blue: 0.078, alpha: 1.0)
|
||||
|
||||
/// UV Violet - Deep purple for backgrounds
|
||||
static let uvViolet = NSColor(red: 0.482, green: 0.0, blue: 1.0, alpha: 1.0)
|
||||
|
||||
/// Deep Black - Background color
|
||||
static let background = NSColor(red: 0.0, green: 0.0, blue: 0.0, alpha: 1.0)
|
||||
|
||||
/// Dark Purple - Alternative background
|
||||
static let darkPurple = NSColor(red: 0.1, green: 0.0, blue: 0.15, alpha: 1.0)
|
||||
|
||||
/// Hot Pink - Peak indicators
|
||||
static let hotPink = NSColor(red: 1.0, green: 0.2, blue: 0.6, alpha: 1.0)
|
||||
|
||||
/// Electric Blue - UI elements
|
||||
static let electricBlue = NSColor(red: 0.0, green: 0.5, blue: 1.0, alpha: 1.0)
|
||||
|
||||
// MARK: - SIMD3<Float> Colors (for Metal shaders)
|
||||
|
||||
struct Metal {
|
||||
static let neonMagenta = SIMD3<Float>(1.0, 0.0, 1.0)
|
||||
static let neonCyan = SIMD3<Float>(0.0, 1.0, 1.0)
|
||||
static let neonGreen = SIMD3<Float>(0.224, 1.0, 0.078)
|
||||
static let uvViolet = SIMD3<Float>(0.482, 0.0, 1.0)
|
||||
static let background = SIMD3<Float>(0.0, 0.0, 0.0)
|
||||
static let darkPurple = SIMD3<Float>(0.1, 0.0, 0.15)
|
||||
static let hotPink = SIMD3<Float>(1.0, 0.2, 0.6)
|
||||
static let electricBlue = SIMD3<Float>(0.0, 0.5, 1.0)
|
||||
|
||||
/// Array of all palette colors for cycling
|
||||
static let palette: [SIMD3<Float>] = [
|
||||
neonMagenta,
|
||||
neonCyan,
|
||||
neonGreen,
|
||||
uvViolet,
|
||||
hotPink,
|
||||
electricBlue
|
||||
]
|
||||
|
||||
/// Get color from palette by index (wraps around)
|
||||
static func color(at index: Int) -> SIMD3<Float> {
|
||||
palette[index % palette.count]
|
||||
}
|
||||
|
||||
/// Interpolate between two colors
|
||||
static func lerp(_ a: SIMD3<Float>, _ b: SIMD3<Float>, t: Float) -> SIMD3<Float> {
|
||||
a + (b - a) * t
|
||||
}
|
||||
|
||||
/// Get rainbow color from normalized value (0-1)
|
||||
static func rainbow(_ t: Float) -> SIMD3<Float> {
|
||||
let index = Int(t * Float(palette.count))
|
||||
let nextIndex = (index + 1) % palette.count
|
||||
let localT = (t * Float(palette.count)) - Float(index)
|
||||
return lerp(palette[index % palette.count], palette[nextIndex], t: localT)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Gradient Helpers
|
||||
|
||||
/// Creates a gradient from UV Violet through Magenta to Cyan
|
||||
static var spectrumGradient: NSGradient? {
|
||||
NSGradient(colors: [uvViolet, neonMagenta, hotPink, neonCyan, neonGreen])
|
||||
}
|
||||
|
||||
/// Creates a gradient for heat maps (low to high energy)
|
||||
static var heatmapGradient: NSGradient? {
|
||||
NSGradient(colors: [
|
||||
NSColor(red: 0.1, green: 0.0, blue: 0.2, alpha: 1.0), // Dark purple (low)
|
||||
uvViolet,
|
||||
neonMagenta,
|
||||
hotPink,
|
||||
neonCyan,
|
||||
neonGreen,
|
||||
NSColor.white // White (peak)
|
||||
])
|
||||
}
|
||||
|
||||
// MARK: - UI Theme Colors
|
||||
|
||||
struct UI {
|
||||
static let panelBackground = NSColor(red: 0.05, green: 0.02, blue: 0.08, alpha: 0.9)
|
||||
static let buttonBackground = NSColor(red: 0.15, green: 0.05, blue: 0.2, alpha: 1.0)
|
||||
static let buttonHighlight = neonMagenta.withAlphaComponent(0.8)
|
||||
static let sliderTint = neonCyan
|
||||
static let labelText = NSColor.white
|
||||
static let secondaryText = NSColor(white: 0.7, alpha: 1.0)
|
||||
static let border = uvViolet.withAlphaComponent(0.5)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - NSColor Extension
|
||||
|
||||
extension NSColor {
|
||||
/// Converts NSColor to SIMD3<Float> for Metal
|
||||
var simd3: SIMD3<Float> {
|
||||
guard let rgb = usingColorSpace(.deviceRGB) else {
|
||||
return SIMD3<Float>(0, 0, 0)
|
||||
}
|
||||
return SIMD3<Float>(
|
||||
Float(rgb.redComponent),
|
||||
Float(rgb.greenComponent),
|
||||
Float(rgb.blueComponent)
|
||||
)
|
||||
}
|
||||
|
||||
/// Converts NSColor to SIMD4<Float> for Metal (with alpha)
|
||||
var simd4: SIMD4<Float> {
|
||||
guard let rgb = usingColorSpace(.deviceRGB) else {
|
||||
return SIMD4<Float>(0, 0, 0, 1)
|
||||
}
|
||||
return SIMD4<Float>(
|
||||
Float(rgb.redComponent),
|
||||
Float(rgb.greenComponent),
|
||||
Float(rgb.blueComponent),
|
||||
Float(rgb.alphaComponent)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,185 @@
|
||||
//
|
||||
// SettingsManager.swift
|
||||
// PsytranceVisualizer
|
||||
//
|
||||
// Handles loading and saving of application settings
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
|
||||
/// Manages persistent storage and retrieval of application settings
|
||||
final class SettingsManager: ObservableObject {
|
||||
// MARK: - Singleton
|
||||
|
||||
static let shared = SettingsManager()
|
||||
|
||||
// MARK: - Published Properties
|
||||
|
||||
@Published private(set) var settings: AppSettings
|
||||
|
||||
// MARK: - Private Properties
|
||||
|
||||
private let settingsKey = "PsytranceVisualizerSettings"
|
||||
private let fileManager = FileManager.default
|
||||
private var saveWorkItem: DispatchWorkItem?
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
private init() {
|
||||
self.settings = SettingsManager.loadSettings()
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
|
||||
/// Updates settings and triggers auto-save
|
||||
func updateSettings(_ update: (inout AppSettings) -> Void) {
|
||||
update(&settings)
|
||||
settings.validate()
|
||||
scheduleSave()
|
||||
}
|
||||
|
||||
/// Updates selected audio device
|
||||
func setAudioDevice(uid: String?) {
|
||||
updateSettings { $0.selectedAudioDeviceUID = uid }
|
||||
}
|
||||
|
||||
/// Updates buffer size
|
||||
func setBufferSize(_ size: Int) {
|
||||
guard AppSettings.availableBufferSizes.contains(size) else { return }
|
||||
updateSettings { $0.bufferSize = size }
|
||||
}
|
||||
|
||||
/// Updates visualization mode
|
||||
func setVisualizationMode(_ mode: VisualizationMode) {
|
||||
updateSettings { $0.lastVisualizationMode = mode.rawValue }
|
||||
}
|
||||
|
||||
/// Updates reactivity
|
||||
func setReactivity(_ value: Float) {
|
||||
updateSettings { $0.reactivity = max(0.0, min(1.0, value)) }
|
||||
}
|
||||
|
||||
/// Updates fullscreen state
|
||||
func setFullscreen(_ isFullscreen: Bool) {
|
||||
updateSettings { $0.isFullscreen = isFullscreen }
|
||||
}
|
||||
|
||||
/// Updates window frame
|
||||
func setWindowFrame(_ frame: CGRect) {
|
||||
updateSettings { $0.windowFrame = CodableRect(from: frame) }
|
||||
}
|
||||
|
||||
/// Updates input gain
|
||||
func setInputGain(_ gain: Float) {
|
||||
updateSettings { $0.inputGain = max(0.0, min(2.0, gain)) }
|
||||
}
|
||||
|
||||
/// Updates FPS display setting
|
||||
func setShowFPS(_ show: Bool) {
|
||||
updateSettings { $0.showFPS = show }
|
||||
}
|
||||
|
||||
/// Forces immediate save
|
||||
func saveNow() {
|
||||
saveWorkItem?.cancel()
|
||||
performSave()
|
||||
}
|
||||
|
||||
/// Resets to default settings
|
||||
func resetToDefaults() {
|
||||
settings = .default
|
||||
saveNow()
|
||||
}
|
||||
|
||||
// MARK: - Private Methods
|
||||
|
||||
/// Schedules a debounced save operation
|
||||
private func scheduleSave() {
|
||||
saveWorkItem?.cancel()
|
||||
|
||||
let workItem = DispatchWorkItem { [weak self] in
|
||||
self?.performSave()
|
||||
}
|
||||
|
||||
saveWorkItem = workItem
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: workItem)
|
||||
}
|
||||
|
||||
/// Performs the actual save operation
|
||||
private func performSave() {
|
||||
do {
|
||||
let encoder = JSONEncoder()
|
||||
encoder.outputFormatting = .prettyPrinted
|
||||
let data = try encoder.encode(settings)
|
||||
|
||||
// Save to UserDefaults
|
||||
UserDefaults.standard.set(data, forKey: settingsKey)
|
||||
|
||||
// Also save to file for backup
|
||||
if let url = settingsFileURL {
|
||||
try data.write(to: url)
|
||||
}
|
||||
|
||||
print("[SettingsManager] Settings saved successfully")
|
||||
} catch {
|
||||
print("[SettingsManager] Failed to save settings: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
/// Loads settings from storage
|
||||
private static func loadSettings() -> AppSettings {
|
||||
// Try UserDefaults first
|
||||
if let data = UserDefaults.standard.data(forKey: "PsytranceVisualizerSettings") {
|
||||
do {
|
||||
var settings = try JSONDecoder().decode(AppSettings.self, from: data)
|
||||
settings.validate()
|
||||
print("[SettingsManager] Settings loaded from UserDefaults")
|
||||
return settings
|
||||
} catch {
|
||||
print("[SettingsManager] Failed to decode settings from UserDefaults: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
// Try file backup
|
||||
if let url = settingsFileURL,
|
||||
let data = try? Data(contentsOf: url) {
|
||||
do {
|
||||
var settings = try JSONDecoder().decode(AppSettings.self, from: data)
|
||||
settings.validate()
|
||||
print("[SettingsManager] Settings loaded from file")
|
||||
return settings
|
||||
} catch {
|
||||
print("[SettingsManager] Failed to decode settings from file: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
print("[SettingsManager] Using default settings")
|
||||
return .default
|
||||
}
|
||||
|
||||
/// URL for settings file backup
|
||||
private static var settingsFileURL: URL? {
|
||||
guard let appSupport = FileManager.default.urls(
|
||||
for: .applicationSupportDirectory,
|
||||
in: .userDomainMask
|
||||
).first else {
|
||||
return nil
|
||||
}
|
||||
|
||||
let appDirectory = appSupport.appendingPathComponent("PsytranceVisualizer")
|
||||
|
||||
// Create directory if needed
|
||||
try? FileManager.default.createDirectory(
|
||||
at: appDirectory,
|
||||
withIntermediateDirectories: true
|
||||
)
|
||||
|
||||
return appDirectory.appendingPathComponent("settings.json")
|
||||
}
|
||||
|
||||
/// Current visualization mode
|
||||
var currentVisualizationMode: VisualizationMode {
|
||||
VisualizationMode(rawValue: settings.lastVisualizationMode) ?? .fftClassic
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
//
|
||||
// AppDelegate.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import UIKit
|
||||
|
||||
@main
|
||||
class AppDelegate: UIResponder, UIApplicationDelegate {
|
||||
|
||||
var window: UIWindow?
|
||||
|
||||
func application(_ application: UIApplication,
|
||||
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func applicationWillResignActive(_ application: UIApplication) {
|
||||
// Pause the game when app goes to background
|
||||
NotificationCenter.default.post(name: .pauseGame, object: nil)
|
||||
}
|
||||
|
||||
func applicationDidEnterBackground(_ application: UIApplication) {
|
||||
// Save game state if needed
|
||||
}
|
||||
|
||||
func applicationWillEnterForeground(_ application: UIApplication) {
|
||||
// Restore game state if needed
|
||||
}
|
||||
|
||||
func applicationDidBecomeActive(_ application: UIApplication) {
|
||||
// Resume game if needed
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Notification Names
|
||||
extension Notification.Name {
|
||||
static let pauseGame = Notification.Name("pauseGame")
|
||||
static let resumeGame = Notification.Name("resumeGame")
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"colors" : [
|
||||
{
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "0.600",
|
||||
"green" : "0.300",
|
||||
"red" : "0.400"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"platform" : "ios",
|
||||
"size" : "1024x1024"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
|
||||
<device id="retina6_12" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="EHf-IW-A2E">
|
||||
<objects>
|
||||
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
|
||||
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="🧳" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Emoji-Label">
|
||||
<rect key="frame" x="146.66666666666666" y="356" width="100" height="80"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="100" id="width-constraint"/>
|
||||
<constraint firstAttribute="height" constant="80" id="height-constraint"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="60"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rollkoffer Simulator" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Title-Label">
|
||||
<rect key="frame" x="46.666666666666657" y="456" width="300" height="30"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="300" id="title-width"/>
|
||||
<constraint firstAttribute="height" constant="30" id="title-height"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
|
||||
<color key="textColor" red="0.4" green="0.3" blue="0.6" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Created by Ingo K." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Credits-Label">
|
||||
<rect key="frame" x="96.666666666666671" y="792" width="200" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="200" id="credits-width"/>
|
||||
<constraint firstAttribute="height" constant="20" id="credits-height"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="italicSystem" pointSize="14"/>
|
||||
<color key="textColor" systemColor="secondaryLabelColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
|
||||
<color key="backgroundColor" red="0.9" green="0.9" blue="0.85" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Emoji-Label" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="emoji-centerx"/>
|
||||
<constraint firstItem="Emoji-Label" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" constant="-30" id="emoji-centery"/>
|
||||
<constraint firstItem="Title-Label" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="title-centerx"/>
|
||||
<constraint firstItem="Title-Label" firstAttribute="top" secondItem="Emoji-Label" secondAttribute="bottom" constant="20" id="title-top"/>
|
||||
<constraint firstItem="Credits-Label" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="credits-centerx"/>
|
||||
<constraint firstItem="Credits-Label" firstAttribute="bottom" secondItem="6Tk-OE-BBY" secondAttribute="bottom" constant="-20" id="credits-bottom"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="53" y="375"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
</document>
|
||||
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
|
||||
<device id="retina6_12" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--Game View Controller-->
|
||||
<scene sceneID="tne-QT-ifu">
|
||||
<objects>
|
||||
<viewController id="BYZ-38-t0r" customClass="GameViewController" customModule="RollkofferSimulator" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC" customClass="SKView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-29" y="-21"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
</document>
|
||||
@@ -0,0 +1,79 @@
|
||||
//
|
||||
// GameViewController.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import UIKit
|
||||
import SpriteKit
|
||||
import GameplayKit
|
||||
|
||||
class GameViewController: UIViewController {
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
// Configure the view
|
||||
guard let skView = self.view as? SKView else {
|
||||
fatalError("View is not an SKView")
|
||||
}
|
||||
|
||||
// Create and configure the initial scene
|
||||
let scene = MenuScene(size: skView.bounds.size)
|
||||
scene.scaleMode = .aspectFill
|
||||
|
||||
// Configure view options
|
||||
skView.ignoresSiblingOrder = true
|
||||
|
||||
#if DEBUG
|
||||
skView.showsFPS = true
|
||||
skView.showsNodeCount = true
|
||||
#endif
|
||||
|
||||
// Present the scene
|
||||
skView.presentScene(scene)
|
||||
|
||||
// Setup notification observers
|
||||
setupNotificationObservers()
|
||||
}
|
||||
|
||||
private func setupNotificationObservers() {
|
||||
NotificationCenter.default.addObserver(
|
||||
self,
|
||||
selector: #selector(handlePauseNotification),
|
||||
name: .pauseGame,
|
||||
object: nil
|
||||
)
|
||||
}
|
||||
|
||||
@objc private func handlePauseNotification() {
|
||||
guard let skView = self.view as? SKView,
|
||||
let gameScene = skView.scene as? GameScene else {
|
||||
return
|
||||
}
|
||||
|
||||
// The GameScene should handle pausing internally
|
||||
// This is just a notification that the app is going to background
|
||||
}
|
||||
|
||||
override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
|
||||
if UIDevice.current.userInterfaceIdiom == .phone {
|
||||
return .portrait
|
||||
} else {
|
||||
return .all
|
||||
}
|
||||
}
|
||||
|
||||
override var prefersStatusBarHidden: Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
override var preferredScreenEdgesDeferringSystemGestures: UIRectEdge {
|
||||
return .all
|
||||
}
|
||||
|
||||
deinit {
|
||||
NotificationCenter.default.removeObserver(self)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>Rollkoffer Simulator</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>UIApplicationSceneManifest</key>
|
||||
<dict>
|
||||
<key>UIApplicationSupportsMultipleScenes</key>
|
||||
<false/>
|
||||
</dict>
|
||||
<key>UILaunchStoryboardName</key>
|
||||
<string>LaunchScreen</string>
|
||||
<key>UIMainStoryboardFile</key>
|
||||
<string>Main</string>
|
||||
<key>UIRequiredDeviceCapabilities</key>
|
||||
<array>
|
||||
<string>armv7</string>
|
||||
</array>
|
||||
<key>UIRequiresFullScreen</key>
|
||||
<true/>
|
||||
<key>UIStatusBarHidden</key>
|
||||
<true/>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations~ipad</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
<string>UIInterfaceOrientationPortraitUpsideDown</string>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,197 @@
|
||||
//
|
||||
// CollisionManager.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
/// Protocol for collision event handling
|
||||
protocol CollisionManagerDelegate: AnyObject {
|
||||
func didCollectGoodDog(points: Int)
|
||||
func didCollectGreenHuman(points: Int)
|
||||
func didHitHarmfulEntity()
|
||||
}
|
||||
|
||||
/// Manages collision detection and response
|
||||
class CollisionManager: NSObject, SKPhysicsContactDelegate {
|
||||
|
||||
// MARK: - Properties
|
||||
weak var delegate: CollisionManagerDelegate?
|
||||
|
||||
// MARK: - SKPhysicsContactDelegate
|
||||
func didBegin(_ contact: SKPhysicsContact) {
|
||||
let collision = contact.bodyA.categoryBitMask | contact.bodyB.categoryBitMask
|
||||
|
||||
// Check if suitcase is involved
|
||||
guard collision & Constants.PhysicsCategory.suitcase != 0 else { return }
|
||||
|
||||
let otherBody: SKPhysicsBody
|
||||
if contact.bodyA.categoryBitMask == Constants.PhysicsCategory.suitcase {
|
||||
otherBody = contact.bodyB
|
||||
} else {
|
||||
otherBody = contact.bodyA
|
||||
}
|
||||
|
||||
handleCollision(with: otherBody)
|
||||
}
|
||||
|
||||
// MARK: - Private Methods
|
||||
private func handleCollision(with body: SKPhysicsBody) {
|
||||
guard let node = body.node else { return }
|
||||
|
||||
switch body.categoryBitMask {
|
||||
case Constants.PhysicsCategory.goodDog:
|
||||
handleGoodDogCollision(node: node)
|
||||
|
||||
case Constants.PhysicsCategory.badDog:
|
||||
handleBadDogCollision(node: node)
|
||||
|
||||
case Constants.PhysicsCategory.greenHuman:
|
||||
handleGreenHumanCollision(node: node)
|
||||
|
||||
case Constants.PhysicsCategory.grayHuman:
|
||||
handleGrayHumanCollision(node: node)
|
||||
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
private func handleGoodDogCollision(node: SKNode) {
|
||||
guard let dogNode = node as? DogNode else { return }
|
||||
|
||||
let points = dogNode.dogType.points
|
||||
showCollectEffect(at: node.position, color: .green, text: "+\(points)")
|
||||
node.removeFromParent()
|
||||
delegate?.didCollectGoodDog(points: points)
|
||||
}
|
||||
|
||||
private func handleBadDogCollision(node: SKNode) {
|
||||
showDamageEffect(at: node.position)
|
||||
node.removeFromParent()
|
||||
delegate?.didHitHarmfulEntity()
|
||||
}
|
||||
|
||||
private func handleGreenHumanCollision(node: SKNode) {
|
||||
guard let humanNode = node as? HumanNode else { return }
|
||||
|
||||
let points = humanNode.humanType.points
|
||||
showCollectEffect(at: node.position, color: .green, text: "+\(points)")
|
||||
node.removeFromParent()
|
||||
delegate?.didCollectGreenHuman(points: points)
|
||||
}
|
||||
|
||||
private func handleGrayHumanCollision(node: SKNode) {
|
||||
showDamageEffect(at: node.position)
|
||||
node.removeFromParent()
|
||||
delegate?.didHitHarmfulEntity()
|
||||
}
|
||||
|
||||
// MARK: - Visual Effects
|
||||
private func showCollectEffect(at position: CGPoint, color: SKColor, text: String) {
|
||||
guard let scene = getScene() else { return }
|
||||
|
||||
// Particle burst
|
||||
let emitter = SKEmitterNode()
|
||||
emitter.particleTexture = nil
|
||||
emitter.particleBirthRate = 50
|
||||
emitter.numParticlesToEmit = 20
|
||||
emitter.particleLifetime = 0.5
|
||||
emitter.particleSpeed = 100
|
||||
emitter.particleSpeedRange = 50
|
||||
emitter.emissionAngleRange = .pi * 2
|
||||
emitter.particleScale = 0.3
|
||||
emitter.particleScaleRange = 0.2
|
||||
emitter.particleColor = color
|
||||
emitter.particleColorBlendFactor = 1.0
|
||||
emitter.position = position
|
||||
emitter.zPosition = Constants.ZPosition.ui - 1
|
||||
|
||||
// Create a simple circle shape for particles
|
||||
let shape = SKShapeNode(circleOfRadius: 5)
|
||||
shape.fillColor = color
|
||||
shape.strokeColor = .clear
|
||||
if let texture = scene.view?.texture(from: shape) {
|
||||
emitter.particleTexture = texture
|
||||
}
|
||||
|
||||
scene.addChild(emitter)
|
||||
|
||||
let waitAction = SKAction.wait(forDuration: 1.0)
|
||||
let removeAction = SKAction.removeFromParent()
|
||||
emitter.run(SKAction.sequence([waitAction, removeAction]))
|
||||
|
||||
// Floating text
|
||||
let label = SKLabelNode(text: text)
|
||||
label.fontName = "AvenirNext-Bold"
|
||||
label.fontSize = 24
|
||||
label.fontColor = color
|
||||
label.position = position
|
||||
label.zPosition = Constants.ZPosition.ui
|
||||
|
||||
scene.addChild(label)
|
||||
|
||||
let moveUp = SKAction.moveBy(x: 0, y: 50, duration: 0.5)
|
||||
let fadeOut = SKAction.fadeOut(withDuration: 0.5)
|
||||
let group = SKAction.group([moveUp, fadeOut])
|
||||
let remove = SKAction.removeFromParent()
|
||||
label.run(SKAction.sequence([group, remove]))
|
||||
}
|
||||
|
||||
private func showDamageEffect(at position: CGPoint) {
|
||||
guard let scene = getScene() else { return }
|
||||
|
||||
// Red flash
|
||||
let flash = SKShapeNode(circleOfRadius: 30)
|
||||
flash.fillColor = .red
|
||||
flash.strokeColor = .clear
|
||||
flash.alpha = 0.7
|
||||
flash.position = position
|
||||
flash.zPosition = Constants.ZPosition.ui - 1
|
||||
|
||||
scene.addChild(flash)
|
||||
|
||||
let scaleUp = SKAction.scale(to: 2.0, duration: 0.2)
|
||||
let fadeOut = SKAction.fadeOut(withDuration: 0.2)
|
||||
let group = SKAction.group([scaleUp, fadeOut])
|
||||
let remove = SKAction.removeFromParent()
|
||||
flash.run(SKAction.sequence([group, remove]))
|
||||
|
||||
// Floating text
|
||||
let label = SKLabelNode(text: "-1 ❤️")
|
||||
label.fontName = "AvenirNext-Bold"
|
||||
label.fontSize = 24
|
||||
label.fontColor = .red
|
||||
label.position = position
|
||||
label.zPosition = Constants.ZPosition.ui
|
||||
|
||||
scene.addChild(label)
|
||||
|
||||
let moveUp = SKAction.moveBy(x: 0, y: 50, duration: 0.5)
|
||||
let labelFadeOut = SKAction.fadeOut(withDuration: 0.5)
|
||||
let labelGroup = SKAction.group([moveUp, labelFadeOut])
|
||||
let labelRemove = SKAction.removeFromParent()
|
||||
label.run(SKAction.sequence([labelGroup, labelRemove]))
|
||||
}
|
||||
|
||||
private func getScene() -> SKScene? {
|
||||
// This would typically be set via dependency injection
|
||||
// For simplicity, we'll use the notification pattern
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Scene Reference Extension
|
||||
extension CollisionManager {
|
||||
private static var sceneReference: SKScene?
|
||||
|
||||
func setScene(_ scene: SKScene) {
|
||||
CollisionManager.sceneReference = scene
|
||||
}
|
||||
|
||||
private func getSceneFromReference() -> SKScene? {
|
||||
return CollisionManager.sceneReference
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
//
|
||||
// ScoreManager.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Manages high scores and game statistics
|
||||
class ScoreManager {
|
||||
|
||||
// MARK: - Singleton
|
||||
static let shared = ScoreManager()
|
||||
|
||||
// MARK: - UserDefaults Keys
|
||||
private let highScoreKey = "RollkofferSimulator.HighScore"
|
||||
private let gamesPlayedKey = "RollkofferSimulator.GamesPlayed"
|
||||
private let totalDogsCollectedKey = "RollkofferSimulator.TotalDogsCollected"
|
||||
private let totalHumansCollectedKey = "RollkofferSimulator.TotalHumansCollected"
|
||||
private let victoriesKey = "RollkofferSimulator.Victories"
|
||||
|
||||
// MARK: - Properties
|
||||
private let defaults = UserDefaults.standard
|
||||
|
||||
var highScore: Int {
|
||||
get { defaults.integer(forKey: highScoreKey) }
|
||||
set { defaults.set(newValue, forKey: highScoreKey) }
|
||||
}
|
||||
|
||||
var gamesPlayed: Int {
|
||||
get { defaults.integer(forKey: gamesPlayedKey) }
|
||||
set { defaults.set(newValue, forKey: gamesPlayedKey) }
|
||||
}
|
||||
|
||||
var totalDogsCollected: Int {
|
||||
get { defaults.integer(forKey: totalDogsCollectedKey) }
|
||||
set { defaults.set(newValue, forKey: totalDogsCollectedKey) }
|
||||
}
|
||||
|
||||
var totalHumansCollected: Int {
|
||||
get { defaults.integer(forKey: totalHumansCollectedKey) }
|
||||
set { defaults.set(newValue, forKey: totalHumansCollectedKey) }
|
||||
}
|
||||
|
||||
var victories: Int {
|
||||
get { defaults.integer(forKey: victoriesKey) }
|
||||
set { defaults.set(newValue, forKey: victoriesKey) }
|
||||
}
|
||||
|
||||
// MARK: - Initialization
|
||||
private init() {}
|
||||
|
||||
// MARK: - Public Methods
|
||||
func recordGameEnd(score: Int, dogsCollected: Int, humansCollected: Int, didWin: Bool) {
|
||||
gamesPlayed += 1
|
||||
totalDogsCollected += dogsCollected
|
||||
totalHumansCollected += humansCollected
|
||||
|
||||
if score > highScore {
|
||||
highScore = score
|
||||
}
|
||||
|
||||
if didWin {
|
||||
victories += 1
|
||||
}
|
||||
}
|
||||
|
||||
func isNewHighScore(_ score: Int) -> Bool {
|
||||
return score > highScore
|
||||
}
|
||||
|
||||
func resetStatistics() {
|
||||
highScore = 0
|
||||
gamesPlayed = 0
|
||||
totalDogsCollected = 0
|
||||
totalHumansCollected = 0
|
||||
victories = 0
|
||||
}
|
||||
|
||||
// MARK: - Formatted Statistics
|
||||
func getStatisticsText() -> String {
|
||||
return """
|
||||
High Score: \(highScore)
|
||||
Games Played: \(gamesPlayed)
|
||||
Victories: \(victories)
|
||||
Total Dogs: \(totalDogsCollected)
|
||||
Total Humans: \(totalHumansCollected)
|
||||
"""
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
//
|
||||
// SpawnManager.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
/// Manages spawning of entities at the top of the screen
|
||||
class SpawnManager {
|
||||
|
||||
// MARK: - Properties
|
||||
private weak var scene: SKScene?
|
||||
private var spawnTimer: TimeInterval = 0
|
||||
private var nextSpawnInterval: TimeInterval = 0
|
||||
private var isSpawning: Bool = false
|
||||
|
||||
// MARK: - Initialization
|
||||
init(scene: SKScene) {
|
||||
self.scene = scene
|
||||
resetSpawnInterval()
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
func startSpawning() {
|
||||
isSpawning = true
|
||||
resetSpawnInterval()
|
||||
}
|
||||
|
||||
func stopSpawning() {
|
||||
isSpawning = false
|
||||
}
|
||||
|
||||
func update(deltaTime: TimeInterval) {
|
||||
guard isSpawning else { return }
|
||||
|
||||
spawnTimer += deltaTime
|
||||
|
||||
if spawnTimer >= nextSpawnInterval {
|
||||
spawnEntity()
|
||||
spawnTimer = 0
|
||||
resetSpawnInterval()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Private Methods
|
||||
private func resetSpawnInterval() {
|
||||
nextSpawnInterval = TimeInterval.random(in: Constants.spawnIntervalMin...Constants.spawnIntervalMax)
|
||||
}
|
||||
|
||||
private func spawnEntity() {
|
||||
guard let scene = scene else { return }
|
||||
|
||||
let entityType = determineEntityType()
|
||||
let entity = createEntity(type: entityType)
|
||||
|
||||
// Random x position
|
||||
let margin: CGFloat = 60
|
||||
let minX = margin
|
||||
let maxX = scene.frame.width - margin
|
||||
let randomX = CGFloat.random(in: minX...maxX)
|
||||
|
||||
// Spawn above screen
|
||||
entity.position = CGPoint(x: randomX, y: scene.frame.height + 50)
|
||||
|
||||
scene.addChild(entity)
|
||||
|
||||
// Move entity down
|
||||
let moveDistance = scene.frame.height + 200
|
||||
let moveDuration = moveDistance / Constants.scrollSpeed
|
||||
let moveAction = SKAction.moveBy(x: 0, y: -moveDistance, duration: moveDuration)
|
||||
let removeAction = SKAction.removeFromParent()
|
||||
entity.run(SKAction.sequence([moveAction, removeAction]))
|
||||
}
|
||||
|
||||
private func determineEntityType() -> EntityType {
|
||||
let roll = Int.random(in: 0..<100)
|
||||
|
||||
if roll < Constants.spawnChanceGoodDog {
|
||||
// 40% good dogs (split between small and big)
|
||||
let isSmall = Bool.random()
|
||||
return .dog(isSmall ? .smallGood : .bigGood)
|
||||
} else if roll < Constants.spawnChanceBadDog {
|
||||
// 20% bad dogs
|
||||
return .dog(.bad)
|
||||
} else if roll < Constants.spawnChanceGreenHuman {
|
||||
// 25% green humans
|
||||
return .human(.green)
|
||||
} else {
|
||||
// 15% gray humans
|
||||
return .human(.gray)
|
||||
}
|
||||
}
|
||||
|
||||
private func createEntity(type: EntityType) -> SKNode {
|
||||
switch type {
|
||||
case .dog(let dogType):
|
||||
return DogNode(type: dogType)
|
||||
case .human(let humanType):
|
||||
return HumanNode(type: humanType)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
//
|
||||
// EntityType.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Types of dogs in the game
|
||||
enum DogType {
|
||||
case smallGood // 40x40, gold brown, +10 points
|
||||
case bigGood // 70x70, gold brown, +25 points
|
||||
case bad // 55x55, red outlined, -1 life
|
||||
|
||||
var points: Int {
|
||||
switch self {
|
||||
case .smallGood: return Constants.pointsSmallGoodDog
|
||||
case .bigGood: return Constants.pointsBigGoodDog
|
||||
case .bad: return 0
|
||||
}
|
||||
}
|
||||
|
||||
var isHarmful: Bool {
|
||||
return self == .bad
|
||||
}
|
||||
|
||||
var countsTowardGoal: Bool {
|
||||
return self == .smallGood || self == .bigGood
|
||||
}
|
||||
}
|
||||
|
||||
/// Types of humans in the game
|
||||
enum HumanType {
|
||||
case green // 50x80, green, +15 points
|
||||
case gray // 50x80, gray, -1 life
|
||||
|
||||
var points: Int {
|
||||
switch self {
|
||||
case .green: return Constants.pointsGreenHuman
|
||||
case .gray: return 0
|
||||
}
|
||||
}
|
||||
|
||||
var isHarmful: Bool {
|
||||
return self == .gray
|
||||
}
|
||||
|
||||
var countsTowardGoal: Bool {
|
||||
return self == .green
|
||||
}
|
||||
}
|
||||
|
||||
/// All entity types for spawn system
|
||||
enum EntityType {
|
||||
case dog(DogType)
|
||||
case human(HumanType)
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
//
|
||||
// GameState.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Possible game states
|
||||
enum GameStateType {
|
||||
case startScreen
|
||||
case playing
|
||||
case paused
|
||||
case gameOver
|
||||
case victory
|
||||
}
|
||||
|
||||
/// Manages the current game state and statistics
|
||||
class GameState {
|
||||
|
||||
// MARK: - Properties
|
||||
private(set) var currentState: GameStateType = .startScreen
|
||||
private(set) var score: Int = 0
|
||||
private(set) var lives: Int = Constants.startLives
|
||||
private(set) var dogsCollected: Int = 0
|
||||
private(set) var humansCollected: Int = 0
|
||||
private(set) var timeRemaining: TimeInterval = Constants.gameTime
|
||||
|
||||
var isInvincible: Bool = false
|
||||
|
||||
// MARK: - Computed Properties
|
||||
var hasWon: Bool {
|
||||
return dogsCollected >= Constants.targetDogs &&
|
||||
humansCollected >= Constants.targetHumans
|
||||
}
|
||||
|
||||
var hasLost: Bool {
|
||||
return lives <= 0 || (timeRemaining <= 0 && !hasWon)
|
||||
}
|
||||
|
||||
// MARK: - State Management
|
||||
func setState(_ state: GameStateType) {
|
||||
currentState = state
|
||||
}
|
||||
|
||||
func reset() {
|
||||
score = 0
|
||||
lives = Constants.startLives
|
||||
dogsCollected = 0
|
||||
humansCollected = 0
|
||||
timeRemaining = Constants.gameTime
|
||||
isInvincible = false
|
||||
currentState = .playing
|
||||
}
|
||||
|
||||
// MARK: - Score Management
|
||||
func addPoints(_ points: Int) {
|
||||
score += points
|
||||
}
|
||||
|
||||
func collectDog() {
|
||||
dogsCollected += 1
|
||||
}
|
||||
|
||||
func collectHuman() {
|
||||
humansCollected += 1
|
||||
}
|
||||
|
||||
// MARK: - Lives Management
|
||||
func loseLife() -> Bool {
|
||||
guard !isInvincible else { return false }
|
||||
lives -= 1
|
||||
return true
|
||||
}
|
||||
|
||||
// MARK: - Time Management
|
||||
func updateTime(delta: TimeInterval) {
|
||||
timeRemaining = max(0, timeRemaining - delta)
|
||||
}
|
||||
|
||||
// MARK: - Formatted Strings
|
||||
var formattedTime: String {
|
||||
let seconds = Int(timeRemaining)
|
||||
return "\(seconds)s"
|
||||
}
|
||||
|
||||
var formattedScore: String {
|
||||
return "SCORE: \(score)"
|
||||
}
|
||||
|
||||
var formattedDogs: String {
|
||||
return "🐕 \(dogsCollected)/\(Constants.targetDogs)"
|
||||
}
|
||||
|
||||
var formattedHumans: String {
|
||||
return "👤 \(humansCollected)/\(Constants.targetHumans)"
|
||||
}
|
||||
|
||||
var formattedLives: String {
|
||||
return String(repeating: "❤️", count: lives)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
//
|
||||
// DogNode.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
/// A dog entity node
|
||||
class DogNode: SKNode {
|
||||
|
||||
// MARK: - Properties
|
||||
let dogType: DogType
|
||||
private let bodyNode: SKShapeNode
|
||||
|
||||
// MARK: - Initialization
|
||||
init(type: DogType) {
|
||||
self.dogType = type
|
||||
|
||||
let size: CGSize
|
||||
let color: SKColor
|
||||
let hasRedOutline: Bool
|
||||
|
||||
switch type {
|
||||
case .smallGood:
|
||||
size = Constants.smallDogSize
|
||||
color = Constants.Colors.goodDogColor
|
||||
hasRedOutline = false
|
||||
case .bigGood:
|
||||
size = Constants.bigDogSize
|
||||
color = Constants.Colors.goodDogColor
|
||||
hasRedOutline = false
|
||||
case .bad:
|
||||
size = Constants.badDogSize
|
||||
color = Constants.Colors.goodDogColor
|
||||
hasRedOutline = true
|
||||
}
|
||||
|
||||
// Create dog body (simple oval shape)
|
||||
let bodyPath = CGMutablePath()
|
||||
bodyPath.addEllipse(in: CGRect(x: -size.width / 2, y: -size.height / 2,
|
||||
width: size.width, height: size.height * 0.7))
|
||||
bodyNode = SKShapeNode(path: bodyPath)
|
||||
bodyNode.fillColor = color
|
||||
bodyNode.strokeColor = hasRedOutline ? Constants.Colors.badDogColor : SKColor(white: 0.3, alpha: 1.0)
|
||||
bodyNode.lineWidth = hasRedOutline ? 4 : 2
|
||||
|
||||
super.init()
|
||||
|
||||
addChild(bodyNode)
|
||||
|
||||
// Add head
|
||||
let headSize = size.width * 0.5
|
||||
let head = SKShapeNode(circleOfRadius: headSize / 2)
|
||||
head.position = CGPoint(x: 0, y: size.height * 0.25)
|
||||
head.fillColor = color
|
||||
head.strokeColor = hasRedOutline ? Constants.Colors.badDogColor : SKColor(white: 0.3, alpha: 1.0)
|
||||
head.lineWidth = hasRedOutline ? 3 : 1.5
|
||||
addChild(head)
|
||||
|
||||
// Add ears
|
||||
let earSize = headSize * 0.4
|
||||
for xOffset in [-headSize * 0.4, headSize * 0.4] {
|
||||
let ear = SKShapeNode(ellipseOf: CGSize(width: earSize, height: earSize * 1.5))
|
||||
ear.position = CGPoint(x: xOffset, y: size.height * 0.25 + headSize * 0.35)
|
||||
ear.fillColor = color.withAlphaComponent(0.8)
|
||||
ear.strokeColor = hasRedOutline ? Constants.Colors.badDogColor : SKColor(white: 0.3, alpha: 1.0)
|
||||
ear.lineWidth = hasRedOutline ? 2 : 1
|
||||
addChild(ear)
|
||||
}
|
||||
|
||||
// Add eyes
|
||||
let eyeSize: CGFloat = headSize * 0.15
|
||||
for xOffset in [-headSize * 0.15, headSize * 0.15] {
|
||||
let eye = SKShapeNode(circleOfRadius: eyeSize)
|
||||
eye.position = CGPoint(x: xOffset, y: size.height * 0.28)
|
||||
eye.fillColor = hasRedOutline ? .red : .black
|
||||
eye.strokeColor = .clear
|
||||
addChild(eye)
|
||||
}
|
||||
|
||||
// Add nose
|
||||
let nose = SKShapeNode(circleOfRadius: headSize * 0.1)
|
||||
nose.position = CGPoint(x: 0, y: size.height * 0.18)
|
||||
nose.fillColor = .black
|
||||
nose.strokeColor = .clear
|
||||
addChild(nose)
|
||||
|
||||
// Add tail
|
||||
let tailPath = CGMutablePath()
|
||||
tailPath.move(to: CGPoint(x: 0, y: -size.height * 0.25))
|
||||
tailPath.addQuadCurve(to: CGPoint(x: size.width * 0.3, y: -size.height * 0.1),
|
||||
control: CGPoint(x: size.width * 0.4, y: -size.height * 0.3))
|
||||
let tail = SKShapeNode(path: tailPath)
|
||||
tail.strokeColor = color
|
||||
tail.lineWidth = size.width * 0.1
|
||||
tail.lineCap = .round
|
||||
addChild(tail)
|
||||
|
||||
// Add legs
|
||||
let legWidth = size.width * 0.12
|
||||
let legHeight = size.height * 0.25
|
||||
let legPositions: [CGFloat] = [-size.width * 0.25, -size.width * 0.1,
|
||||
size.width * 0.1, size.width * 0.25]
|
||||
for xPos in legPositions {
|
||||
let leg = SKShapeNode(rect: CGRect(x: xPos - legWidth / 2,
|
||||
y: -size.height * 0.35 - legHeight,
|
||||
width: legWidth, height: legHeight),
|
||||
cornerRadius: legWidth / 2)
|
||||
leg.fillColor = color
|
||||
leg.strokeColor = hasRedOutline ? Constants.Colors.badDogColor : SKColor(white: 0.3, alpha: 1.0)
|
||||
leg.lineWidth = hasRedOutline ? 2 : 1
|
||||
addChild(leg)
|
||||
}
|
||||
|
||||
// Add angry expression for bad dogs
|
||||
if hasRedOutline {
|
||||
let browPath = CGMutablePath()
|
||||
browPath.move(to: CGPoint(x: -headSize * 0.3, y: size.height * 0.35))
|
||||
browPath.addLine(to: CGPoint(x: -headSize * 0.05, y: size.height * 0.32))
|
||||
let leftBrow = SKShapeNode(path: browPath)
|
||||
leftBrow.strokeColor = .black
|
||||
leftBrow.lineWidth = 2
|
||||
addChild(leftBrow)
|
||||
|
||||
let browPath2 = CGMutablePath()
|
||||
browPath2.move(to: CGPoint(x: headSize * 0.3, y: size.height * 0.35))
|
||||
browPath2.addLine(to: CGPoint(x: headSize * 0.05, y: size.height * 0.32))
|
||||
let rightBrow = SKShapeNode(path: browPath2)
|
||||
rightBrow.strokeColor = .black
|
||||
rightBrow.lineWidth = 2
|
||||
addChild(rightBrow)
|
||||
}
|
||||
|
||||
setupPhysics(size: size)
|
||||
self.zPosition = Constants.ZPosition.entities
|
||||
self.name = type.isHarmful ? "badDog" : "goodDog"
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Physics Setup
|
||||
private func setupPhysics(size: CGSize) {
|
||||
let radius = min(size.width, size.height) / 2
|
||||
physicsBody = SKPhysicsBody(circleOfRadius: radius)
|
||||
physicsBody?.isDynamic = true
|
||||
physicsBody?.affectedByGravity = false
|
||||
physicsBody?.allowsRotation = false
|
||||
|
||||
if dogType.isHarmful {
|
||||
physicsBody?.categoryBitMask = Constants.PhysicsCategory.badDog
|
||||
} else {
|
||||
physicsBody?.categoryBitMask = Constants.PhysicsCategory.goodDog
|
||||
}
|
||||
|
||||
physicsBody?.contactTestBitMask = Constants.PhysicsCategory.suitcase
|
||||
physicsBody?.collisionBitMask = Constants.PhysicsCategory.none
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,176 @@
|
||||
//
|
||||
// HumanNode.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
/// A human entity node
|
||||
class HumanNode: SKNode {
|
||||
|
||||
// MARK: - Properties
|
||||
let humanType: HumanType
|
||||
private let bodyNode: SKShapeNode
|
||||
|
||||
// MARK: - Initialization
|
||||
init(type: HumanType) {
|
||||
self.humanType = type
|
||||
|
||||
let size = Constants.humanSize
|
||||
let color: SKColor
|
||||
|
||||
switch type {
|
||||
case .green:
|
||||
color = Constants.Colors.greenHumanColor
|
||||
case .gray:
|
||||
color = Constants.Colors.grayHumanColor
|
||||
}
|
||||
|
||||
// Create body (torso)
|
||||
let torsoHeight = size.height * 0.4
|
||||
let torsoWidth = size.width * 0.6
|
||||
let torsoRect = CGRect(x: -torsoWidth / 2, y: -size.height * 0.1,
|
||||
width: torsoWidth, height: torsoHeight)
|
||||
bodyNode = SKShapeNode(rect: torsoRect, cornerRadius: 5)
|
||||
bodyNode.fillColor = color
|
||||
bodyNode.strokeColor = color.withAlphaComponent(0.7)
|
||||
bodyNode.lineWidth = 2
|
||||
|
||||
super.init()
|
||||
|
||||
addChild(bodyNode)
|
||||
|
||||
// Add head
|
||||
let headRadius = size.width * 0.25
|
||||
let head = SKShapeNode(circleOfRadius: headRadius)
|
||||
head.position = CGPoint(x: 0, y: size.height * 0.35)
|
||||
head.fillColor = SKColor(red: 1.0, green: 0.87, blue: 0.77, alpha: 1.0) // Skin tone
|
||||
head.strokeColor = SKColor(red: 0.9, green: 0.75, blue: 0.65, alpha: 1.0)
|
||||
head.lineWidth = 1
|
||||
addChild(head)
|
||||
|
||||
// Add eyes
|
||||
let eyeSize: CGFloat = 3
|
||||
for xOffset in [-headRadius * 0.35, headRadius * 0.35] {
|
||||
let eye = SKShapeNode(circleOfRadius: eyeSize)
|
||||
eye.position = CGPoint(x: xOffset, y: size.height * 0.37)
|
||||
eye.fillColor = .black
|
||||
eye.strokeColor = .clear
|
||||
addChild(eye)
|
||||
}
|
||||
|
||||
// Add mouth/expression
|
||||
if type == .green {
|
||||
// Happy smile
|
||||
let smilePath = CGMutablePath()
|
||||
smilePath.addArc(center: CGPoint(x: 0, y: size.height * 0.32),
|
||||
radius: headRadius * 0.3,
|
||||
startAngle: .pi * 0.2,
|
||||
endAngle: .pi * 0.8,
|
||||
clockwise: true)
|
||||
let smile = SKShapeNode(path: smilePath)
|
||||
smile.strokeColor = .black
|
||||
smile.lineWidth = 2
|
||||
smile.lineCap = .round
|
||||
addChild(smile)
|
||||
} else {
|
||||
// Neutral/frowning expression
|
||||
let frownPath = CGMutablePath()
|
||||
frownPath.move(to: CGPoint(x: -headRadius * 0.25, y: size.height * 0.3))
|
||||
frownPath.addLine(to: CGPoint(x: headRadius * 0.25, y: size.height * 0.3))
|
||||
let frown = SKShapeNode(path: frownPath)
|
||||
frown.strokeColor = .black
|
||||
frown.lineWidth = 2
|
||||
addChild(frown)
|
||||
}
|
||||
|
||||
// Add arms
|
||||
let armWidth: CGFloat = 6
|
||||
let armLength = size.height * 0.3
|
||||
for xOffset in [-torsoWidth / 2 - armWidth / 2, torsoWidth / 2 + armWidth / 2] {
|
||||
let arm = SKShapeNode(rect: CGRect(x: xOffset - armWidth / 2,
|
||||
y: size.height * 0.05,
|
||||
width: armWidth, height: armLength),
|
||||
cornerRadius: armWidth / 2)
|
||||
arm.fillColor = color
|
||||
arm.strokeColor = color.withAlphaComponent(0.7)
|
||||
arm.lineWidth = 1
|
||||
addChild(arm)
|
||||
|
||||
// Add hand
|
||||
let hand = SKShapeNode(circleOfRadius: armWidth * 0.8)
|
||||
hand.position = CGPoint(x: xOffset, y: size.height * 0.05)
|
||||
hand.fillColor = SKColor(red: 1.0, green: 0.87, blue: 0.77, alpha: 1.0)
|
||||
hand.strokeColor = .clear
|
||||
addChild(hand)
|
||||
}
|
||||
|
||||
// Add legs
|
||||
let legWidth: CGFloat = 10
|
||||
let legHeight = size.height * 0.35
|
||||
for xOffset in [-torsoWidth * 0.25, torsoWidth * 0.25] {
|
||||
let leg = SKShapeNode(rect: CGRect(x: xOffset - legWidth / 2,
|
||||
y: -size.height * 0.45,
|
||||
width: legWidth, height: legHeight),
|
||||
cornerRadius: legWidth / 2)
|
||||
leg.fillColor = SKColor(red: 0.2, green: 0.2, blue: 0.4, alpha: 1.0) // Pants color
|
||||
leg.strokeColor = SKColor(red: 0.15, green: 0.15, blue: 0.3, alpha: 1.0)
|
||||
leg.lineWidth = 1
|
||||
addChild(leg)
|
||||
|
||||
// Add shoe
|
||||
let shoe = SKShapeNode(rect: CGRect(x: xOffset - legWidth * 0.6,
|
||||
y: -size.height * 0.48,
|
||||
width: legWidth * 1.2, height: 6),
|
||||
cornerRadius: 2)
|
||||
shoe.fillColor = .black
|
||||
shoe.strokeColor = .clear
|
||||
addChild(shoe)
|
||||
}
|
||||
|
||||
// Add indicator icon for type
|
||||
if type == .green {
|
||||
let checkmark = SKLabelNode(text: "✓")
|
||||
checkmark.fontSize = 16
|
||||
checkmark.fontColor = .white
|
||||
checkmark.position = CGPoint(x: 0, y: size.height * 0.1)
|
||||
checkmark.verticalAlignmentMode = .center
|
||||
addChild(checkmark)
|
||||
} else {
|
||||
let xMark = SKLabelNode(text: "✗")
|
||||
xMark.fontSize = 16
|
||||
xMark.fontColor = .white
|
||||
xMark.position = CGPoint(x: 0, y: size.height * 0.1)
|
||||
xMark.verticalAlignmentMode = .center
|
||||
addChild(xMark)
|
||||
}
|
||||
|
||||
setupPhysics(size: size)
|
||||
self.zPosition = Constants.ZPosition.entities
|
||||
self.name = type.isHarmful ? "grayHuman" : "greenHuman"
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Physics Setup
|
||||
private func setupPhysics(size: CGSize) {
|
||||
physicsBody = SKPhysicsBody(rectangleOf: CGSize(width: size.width * 0.6,
|
||||
height: size.height * 0.8))
|
||||
physicsBody?.isDynamic = true
|
||||
physicsBody?.affectedByGravity = false
|
||||
physicsBody?.allowsRotation = false
|
||||
|
||||
if humanType.isHarmful {
|
||||
physicsBody?.categoryBitMask = Constants.PhysicsCategory.grayHuman
|
||||
} else {
|
||||
physicsBody?.categoryBitMask = Constants.PhysicsCategory.greenHuman
|
||||
}
|
||||
|
||||
physicsBody?.contactTestBitMask = Constants.PhysicsCategory.suitcase
|
||||
physicsBody?.collisionBitMask = Constants.PhysicsCategory.none
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
//
|
||||
// PlayerNode.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
/// The player-controlled suitcase node
|
||||
class PlayerNode: SKNode {
|
||||
|
||||
// MARK: - Properties
|
||||
private let suitcaseBody: SKShapeNode
|
||||
private let handle: SKShapeNode
|
||||
private let wheels: [SKShapeNode]
|
||||
|
||||
// MARK: - Initialization
|
||||
override init() {
|
||||
let size = Constants.suitcaseSize
|
||||
|
||||
// Create suitcase body (rounded rectangle)
|
||||
let bodyRect = CGRect(x: -size.width / 2, y: -size.height / 2 + 10,
|
||||
width: size.width, height: size.height - 15)
|
||||
suitcaseBody = SKShapeNode(rect: bodyRect, cornerRadius: 8)
|
||||
suitcaseBody.fillColor = Constants.Colors.suitcaseColor
|
||||
suitcaseBody.strokeColor = SKColor(white: 0.2, alpha: 1.0)
|
||||
suitcaseBody.lineWidth = 2
|
||||
|
||||
// Create handle
|
||||
let handlePath = CGMutablePath()
|
||||
handlePath.move(to: CGPoint(x: -10, y: size.height / 2 - 5))
|
||||
handlePath.addLine(to: CGPoint(x: -10, y: size.height / 2 + 15))
|
||||
handlePath.addLine(to: CGPoint(x: 10, y: size.height / 2 + 15))
|
||||
handlePath.addLine(to: CGPoint(x: 10, y: size.height / 2 - 5))
|
||||
handle = SKShapeNode(path: handlePath)
|
||||
handle.strokeColor = SKColor(white: 0.3, alpha: 1.0)
|
||||
handle.lineWidth = 4
|
||||
handle.lineCap = .round
|
||||
|
||||
// Create wheels
|
||||
var tempWheels: [SKShapeNode] = []
|
||||
let wheelPositions = [
|
||||
CGPoint(x: -size.width / 2 + 8, y: -size.height / 2 + 5),
|
||||
CGPoint(x: size.width / 2 - 8, y: -size.height / 2 + 5)
|
||||
]
|
||||
for pos in wheelPositions {
|
||||
let wheel = SKShapeNode(circleOfRadius: 6)
|
||||
wheel.position = pos
|
||||
wheel.fillColor = SKColor.darkGray
|
||||
wheel.strokeColor = SKColor.black
|
||||
wheel.lineWidth = 1
|
||||
tempWheels.append(wheel)
|
||||
}
|
||||
wheels = tempWheels
|
||||
|
||||
super.init()
|
||||
|
||||
// Add decorative stripes
|
||||
let stripe1 = SKShapeNode(rect: CGRect(x: -size.width / 2 + 5, y: 0,
|
||||
width: size.width - 10, height: 3))
|
||||
stripe1.fillColor = SKColor(white: 0.3, alpha: 0.5)
|
||||
stripe1.strokeColor = .clear
|
||||
|
||||
let stripe2 = SKShapeNode(rect: CGRect(x: -size.width / 2 + 5, y: -15,
|
||||
width: size.width - 10, height: 3))
|
||||
stripe2.fillColor = SKColor(white: 0.3, alpha: 0.5)
|
||||
stripe2.strokeColor = .clear
|
||||
|
||||
addChild(suitcaseBody)
|
||||
addChild(handle)
|
||||
addChild(stripe1)
|
||||
addChild(stripe2)
|
||||
for wheel in wheels {
|
||||
addChild(wheel)
|
||||
}
|
||||
|
||||
setupPhysics()
|
||||
self.zPosition = Constants.ZPosition.player
|
||||
self.name = "player"
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Physics Setup
|
||||
private func setupPhysics() {
|
||||
let size = Constants.suitcaseSize
|
||||
physicsBody = SKPhysicsBody(rectangleOf: size)
|
||||
physicsBody?.isDynamic = true
|
||||
physicsBody?.affectedByGravity = false
|
||||
physicsBody?.allowsRotation = false
|
||||
physicsBody?.categoryBitMask = Constants.PhysicsCategory.suitcase
|
||||
physicsBody?.contactTestBitMask = Constants.PhysicsCategory.all
|
||||
physicsBody?.collisionBitMask = Constants.PhysicsCategory.none
|
||||
}
|
||||
|
||||
// MARK: - Visual Effects
|
||||
func startBlinking() {
|
||||
let fadeOut = SKAction.fadeAlpha(to: 0.3, duration: Constants.blinkDuration)
|
||||
let fadeIn = SKAction.fadeAlpha(to: 1.0, duration: Constants.blinkDuration)
|
||||
let blink = SKAction.sequence([fadeOut, fadeIn])
|
||||
let blinkRepeat = SKAction.repeat(blink, count: Constants.blinkCount)
|
||||
run(blinkRepeat, withKey: "blink")
|
||||
}
|
||||
|
||||
func stopBlinking() {
|
||||
removeAction(forKey: "blink")
|
||||
alpha = 1.0
|
||||
}
|
||||
|
||||
// MARK: - Movement
|
||||
func constrainToScreen(in frame: CGRect) {
|
||||
let halfWidth = Constants.suitcaseSize.width / 2
|
||||
let halfHeight = Constants.suitcaseSize.height / 2
|
||||
|
||||
let minX = frame.minX + halfWidth + 10
|
||||
let maxX = frame.maxX - halfWidth - 10
|
||||
let minY = frame.minY + halfHeight + 10
|
||||
let maxY = frame.maxY - halfHeight - 100 // Leave space for UI
|
||||
|
||||
position.x = max(minX, min(maxX, position.x))
|
||||
position.y = max(minY, min(maxY, position.y))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,457 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 56;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
001 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101 /* AppDelegate.swift */; };
|
||||
002 /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 102 /* GameViewController.swift */; };
|
||||
003 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 103 /* Constants.swift */; };
|
||||
004 /* EntityType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 104 /* EntityType.swift */; };
|
||||
005 /* GameState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 105 /* GameState.swift */; };
|
||||
006 /* PlayerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 106 /* PlayerNode.swift */; };
|
||||
007 /* DogNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 107 /* DogNode.swift */; };
|
||||
008 /* HumanNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 108 /* HumanNode.swift */; };
|
||||
009 /* SpawnManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 109 /* SpawnManager.swift */; };
|
||||
010 /* CollisionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110 /* CollisionManager.swift */; };
|
||||
011 /* ScoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 111 /* ScoreManager.swift */; };
|
||||
012 /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 112 /* MenuScene.swift */; };
|
||||
013 /* GameScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 113 /* GameScene.swift */; };
|
||||
014 /* GameOverScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 114 /* GameOverScene.swift */; };
|
||||
015 /* VictoryScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 115 /* VictoryScene.swift */; };
|
||||
016 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 116 /* Assets.xcassets */; };
|
||||
017 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 117 /* Main.storyboard */; };
|
||||
018 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 118 /* LaunchScreen.storyboard */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
100 /* RollkofferSimulator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RollkofferSimulator.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
101 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
102 /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = "<group>"; };
|
||||
103 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
|
||||
104 /* EntityType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntityType.swift; sourceTree = "<group>"; };
|
||||
105 /* GameState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameState.swift; sourceTree = "<group>"; };
|
||||
106 /* PlayerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerNode.swift; sourceTree = "<group>"; };
|
||||
107 /* DogNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogNode.swift; sourceTree = "<group>"; };
|
||||
108 /* HumanNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HumanNode.swift; sourceTree = "<group>"; };
|
||||
109 /* SpawnManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpawnManager.swift; sourceTree = "<group>"; };
|
||||
110 /* CollisionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollisionManager.swift; sourceTree = "<group>"; };
|
||||
111 /* ScoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScoreManager.swift; sourceTree = "<group>"; };
|
||||
112 /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = "<group>"; };
|
||||
113 /* GameScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = "<group>"; };
|
||||
114 /* GameOverScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameOverScene.swift; sourceTree = "<group>"; };
|
||||
115 /* VictoryScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VictoryScene.swift; sourceTree = "<group>"; };
|
||||
116 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
117 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||
118 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
119 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
200 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
300 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
301 /* RollkofferSimulator */,
|
||||
302 /* Products */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
301 /* RollkofferSimulator */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
101 /* AppDelegate.swift */,
|
||||
102 /* GameViewController.swift */,
|
||||
303 /* Scenes */,
|
||||
304 /* Nodes */,
|
||||
305 /* Managers */,
|
||||
306 /* Models */,
|
||||
307 /* Utils */,
|
||||
116 /* Assets.xcassets */,
|
||||
117 /* Main.storyboard */,
|
||||
118 /* LaunchScreen.storyboard */,
|
||||
119 /* Info.plist */,
|
||||
);
|
||||
path = .;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
302 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
100 /* RollkofferSimulator.app */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
303 /* Scenes */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
112 /* MenuScene.swift */,
|
||||
113 /* GameScene.swift */,
|
||||
114 /* GameOverScene.swift */,
|
||||
115 /* VictoryScene.swift */,
|
||||
);
|
||||
path = Scenes;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
304 /* Nodes */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
106 /* PlayerNode.swift */,
|
||||
107 /* DogNode.swift */,
|
||||
108 /* HumanNode.swift */,
|
||||
);
|
||||
path = Nodes;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
305 /* Managers */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
109 /* SpawnManager.swift */,
|
||||
110 /* CollisionManager.swift */,
|
||||
111 /* ScoreManager.swift */,
|
||||
);
|
||||
path = Managers;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
306 /* Models */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
104 /* EntityType.swift */,
|
||||
105 /* GameState.swift */,
|
||||
);
|
||||
path = Models;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
307 /* Utils */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
103 /* Constants.swift */,
|
||||
);
|
||||
path = Utils;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
400 /* RollkofferSimulator */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 501 /* Build configuration list for PBXNativeTarget "RollkofferSimulator" */;
|
||||
buildPhases = (
|
||||
401 /* Sources */,
|
||||
200 /* Frameworks */,
|
||||
402 /* Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = RollkofferSimulator;
|
||||
productName = RollkofferSimulator;
|
||||
productReference = 100 /* RollkofferSimulator.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
||||
/* Begin PBXProject section */
|
||||
600 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
BuildIndependentTargetsInParallel = 1;
|
||||
LastSwiftUpdateCheck = 1500;
|
||||
LastUpgradeCheck = 1500;
|
||||
TargetAttributes = {
|
||||
400 = {
|
||||
CreatedOnToolsVersion = 15.0;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = 500 /* Build configuration list for PBXProject "RollkofferSimulator" */;
|
||||
compatibilityVersion = "Xcode 14.0";
|
||||
developmentRegion = en;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
de,
|
||||
);
|
||||
mainGroup = 300;
|
||||
productRefGroup = 302 /* Products */;
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
400 /* RollkofferSimulator */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXResourcesBuildPhase section */
|
||||
402 /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
016 /* Assets.xcassets in Resources */,
|
||||
017 /* Main.storyboard in Resources */,
|
||||
018 /* LaunchScreen.storyboard in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
401 /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
001 /* AppDelegate.swift in Sources */,
|
||||
002 /* GameViewController.swift in Sources */,
|
||||
003 /* Constants.swift in Sources */,
|
||||
004 /* EntityType.swift in Sources */,
|
||||
005 /* GameState.swift in Sources */,
|
||||
006 /* PlayerNode.swift in Sources */,
|
||||
007 /* DogNode.swift in Sources */,
|
||||
008 /* HumanNode.swift in Sources */,
|
||||
009 /* SpawnManager.swift in Sources */,
|
||||
010 /* CollisionManager.swift in Sources */,
|
||||
011 /* ScoreManager.swift in Sources */,
|
||||
012 /* MenuScene.swift in Sources */,
|
||||
013 /* GameScene.swift in Sources */,
|
||||
014 /* GameOverScene.swift in Sources */,
|
||||
015 /* VictoryScene.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXVariantGroup section */
|
||||
117 /* Main.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
117 /* Base */,
|
||||
);
|
||||
name = Main.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
118 /* LaunchScreen.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
118 /* Base */,
|
||||
);
|
||||
name = LaunchScreen.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXVariantGroup section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
700 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
ENABLE_USER_SCRIPT_SANDBOXING = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu17;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
701 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_USER_SCRIPT_SANDBOXING = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu17;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
MTL_FAST_MATH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
VALIDATE_PRODUCT = YES;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
702 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
|
||||
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
|
||||
INFOPLIST_KEY_UIMainStoryboardFile = Main;
|
||||
INFOPLIST_KEY_UIStatusBarHidden = YES;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.ingok.RollkofferSimulator;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
703 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
|
||||
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
|
||||
INFOPLIST_KEY_UIMainStoryboardFile = Main;
|
||||
INFOPLIST_KEY_UIStatusBarHidden = YES;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.ingok.RollkofferSimulator;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
500 /* Build configuration list for PBXProject "RollkofferSimulator" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
700 /* Debug */,
|
||||
701 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
501 /* Build configuration list for PBXNativeTarget "RollkofferSimulator" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
702 /* Debug */,
|
||||
703 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
};
|
||||
rootObject = 600 /* Project object */;
|
||||
}
|
||||
@@ -0,0 +1,255 @@
|
||||
//
|
||||
// GameOverScene.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
class GameOverScene: SKScene {
|
||||
|
||||
// MARK: - Properties
|
||||
var finalScore: Int = 0
|
||||
var dogsCollected: Int = 0
|
||||
var humansCollected: Int = 0
|
||||
var isNewHighScore: Bool = false
|
||||
|
||||
private var retryButton: SKShapeNode!
|
||||
private var menuButton: SKShapeNode!
|
||||
|
||||
// MARK: - Scene Lifecycle
|
||||
override func didMove(to view: SKView) {
|
||||
setupBackground()
|
||||
setupContent()
|
||||
setupButtons()
|
||||
startAnimations()
|
||||
}
|
||||
|
||||
// MARK: - Setup
|
||||
private func setupBackground() {
|
||||
backgroundColor = SKColor(red: 0.15, green: 0.1, blue: 0.1, alpha: 1.0)
|
||||
|
||||
// Add dim pattern
|
||||
for i in 0..<20 {
|
||||
let x = CGFloat.random(in: 0...frame.width)
|
||||
let y = CGFloat.random(in: 0...frame.height)
|
||||
let size = CGFloat.random(in: 20...60)
|
||||
|
||||
let shape = SKShapeNode(circleOfRadius: size)
|
||||
shape.position = CGPoint(x: x, y: y)
|
||||
shape.fillColor = SKColor.red.withAlphaComponent(0.05)
|
||||
shape.strokeColor = .clear
|
||||
shape.zPosition = 0.1
|
||||
addChild(shape)
|
||||
}
|
||||
}
|
||||
|
||||
private func setupContent() {
|
||||
// Game Over title
|
||||
let titleLabel = SKLabelNode(text: "💔 GAME OVER 💔")
|
||||
titleLabel.fontName = "AvenirNext-Heavy"
|
||||
titleLabel.fontSize = 42
|
||||
titleLabel.fontColor = .red
|
||||
titleLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.8)
|
||||
titleLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(titleLabel)
|
||||
|
||||
// Subtitle based on reason
|
||||
let subtitleText: String
|
||||
if dogsCollected < Constants.targetDogs || humansCollected < Constants.targetHumans {
|
||||
subtitleText = "Zeit abgelaufen!"
|
||||
} else {
|
||||
subtitleText = "Keine Leben mehr!"
|
||||
}
|
||||
|
||||
let subtitleLabel = SKLabelNode(text: subtitleText)
|
||||
subtitleLabel.fontName = "AvenirNext-Medium"
|
||||
subtitleLabel.fontSize = 22
|
||||
subtitleLabel.fontColor = SKColor(white: 0.8, alpha: 1.0)
|
||||
subtitleLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.72)
|
||||
subtitleLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(subtitleLabel)
|
||||
|
||||
// Score display
|
||||
let scoreLabel = SKLabelNode(text: "Punkte: \(finalScore)")
|
||||
scoreLabel.fontName = "AvenirNext-Bold"
|
||||
scoreLabel.fontSize = 32
|
||||
scoreLabel.fontColor = .white
|
||||
scoreLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.58)
|
||||
scoreLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(scoreLabel)
|
||||
|
||||
// New high score indicator
|
||||
if isNewHighScore {
|
||||
let highScoreLabel = SKLabelNode(text: "🏆 NEUER HIGHSCORE! 🏆")
|
||||
highScoreLabel.fontName = "AvenirNext-Heavy"
|
||||
highScoreLabel.fontSize = 24
|
||||
highScoreLabel.fontColor = SKColor.yellow
|
||||
highScoreLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.65)
|
||||
highScoreLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(highScoreLabel)
|
||||
|
||||
// Animate high score
|
||||
let scale = SKAction.sequence([
|
||||
SKAction.scale(to: 1.1, duration: 0.5),
|
||||
SKAction.scale(to: 1.0, duration: 0.5)
|
||||
])
|
||||
highScoreLabel.run(SKAction.repeatForever(scale))
|
||||
}
|
||||
|
||||
// Stats display
|
||||
let dogsText = "🐕 \(dogsCollected)/\(Constants.targetDogs)"
|
||||
let humansText = "👤 \(humansCollected)/\(Constants.targetHumans)"
|
||||
|
||||
let statsLabel = SKLabelNode(text: "\(dogsText) | \(humansText)")
|
||||
statsLabel.fontName = "AvenirNext-Medium"
|
||||
statsLabel.fontSize = 24
|
||||
statsLabel.fontColor = SKColor(white: 0.7, alpha: 1.0)
|
||||
statsLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.48)
|
||||
statsLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(statsLabel)
|
||||
|
||||
// Progress indicators
|
||||
let dogsProgress = min(1.0, CGFloat(dogsCollected) / CGFloat(Constants.targetDogs))
|
||||
let humansProgress = min(1.0, CGFloat(humansCollected) / CGFloat(Constants.targetHumans))
|
||||
|
||||
addProgressBar(at: CGPoint(x: frame.midX - 60, y: frame.height * 0.42),
|
||||
progress: dogsProgress, color: .orange, label: "Hunde")
|
||||
addProgressBar(at: CGPoint(x: frame.midX + 60, y: frame.height * 0.42),
|
||||
progress: humansProgress, color: .green, label: "Menschen")
|
||||
|
||||
// Sad suitcase
|
||||
let sadSuitcase = PlayerNode()
|
||||
sadSuitcase.position = CGPoint(x: frame.midX, y: frame.height * 0.25)
|
||||
sadSuitcase.alpha = 0.6
|
||||
sadSuitcase.setScale(0.8)
|
||||
addChild(sadSuitcase)
|
||||
|
||||
// Sad face on suitcase area
|
||||
let sadFace = SKLabelNode(text: "😢")
|
||||
sadFace.fontSize = 30
|
||||
sadFace.position = CGPoint(x: frame.midX, y: frame.height * 0.25 + 20)
|
||||
sadFace.zPosition = Constants.ZPosition.ui
|
||||
addChild(sadFace)
|
||||
}
|
||||
|
||||
private func addProgressBar(at position: CGPoint, progress: CGFloat, color: SKColor, label: String) {
|
||||
let barWidth: CGFloat = 80
|
||||
let barHeight: CGFloat = 12
|
||||
|
||||
// Background
|
||||
let bg = SKShapeNode(rect: CGRect(x: -barWidth / 2, y: 0, width: barWidth, height: barHeight),
|
||||
cornerRadius: 6)
|
||||
bg.position = position
|
||||
bg.fillColor = SKColor(white: 0.3, alpha: 1.0)
|
||||
bg.strokeColor = .clear
|
||||
bg.zPosition = Constants.ZPosition.ui
|
||||
addChild(bg)
|
||||
|
||||
// Progress fill
|
||||
let fillWidth = barWidth * progress
|
||||
if fillWidth > 0 {
|
||||
let fill = SKShapeNode(rect: CGRect(x: -barWidth / 2, y: 0, width: fillWidth, height: barHeight),
|
||||
cornerRadius: 6)
|
||||
fill.position = position
|
||||
fill.fillColor = progress >= 1.0 ? .green : color
|
||||
fill.strokeColor = .clear
|
||||
fill.zPosition = Constants.ZPosition.ui + 0.1
|
||||
addChild(fill)
|
||||
}
|
||||
}
|
||||
|
||||
private func setupButtons() {
|
||||
// Retry button
|
||||
retryButton = createButton(text: "🔄 Nochmal", color: SKColor(red: 0.2, green: 0.6, blue: 0.2, alpha: 1.0))
|
||||
retryButton.position = CGPoint(x: frame.midX, y: frame.height * 0.15)
|
||||
retryButton.name = "retryButton"
|
||||
addChild(retryButton)
|
||||
|
||||
// Menu button
|
||||
menuButton = createButton(text: "🏠 Menü", color: SKColor(red: 0.3, green: 0.3, blue: 0.5, alpha: 1.0))
|
||||
menuButton.position = CGPoint(x: frame.midX, y: frame.height * 0.08)
|
||||
menuButton.name = "menuButton"
|
||||
addChild(menuButton)
|
||||
}
|
||||
|
||||
private func createButton(text: String, color: SKColor) -> SKShapeNode {
|
||||
let buttonWidth: CGFloat = 180
|
||||
let buttonHeight: CGFloat = 50
|
||||
|
||||
let button = SKShapeNode(rect: CGRect(x: -buttonWidth / 2, y: -buttonHeight / 2,
|
||||
width: buttonWidth, height: buttonHeight),
|
||||
cornerRadius: 12)
|
||||
button.fillColor = color
|
||||
button.strokeColor = color.withAlphaComponent(0.5)
|
||||
button.lineWidth = 2
|
||||
button.zPosition = Constants.ZPosition.ui
|
||||
|
||||
let label = SKLabelNode(text: text)
|
||||
label.fontName = "AvenirNext-Bold"
|
||||
label.fontSize = 22
|
||||
label.fontColor = .white
|
||||
label.verticalAlignmentMode = .center
|
||||
label.zPosition = 1
|
||||
button.addChild(label)
|
||||
|
||||
return button
|
||||
}
|
||||
|
||||
private func startAnimations() {
|
||||
// Fade in effect
|
||||
alpha = 0
|
||||
let fadeIn = SKAction.fadeIn(withDuration: 0.5)
|
||||
run(fadeIn)
|
||||
|
||||
// Button pulse
|
||||
let pulse = SKAction.sequence([
|
||||
SKAction.scale(to: 1.05, duration: 0.8),
|
||||
SKAction.scale(to: 1.0, duration: 0.8)
|
||||
])
|
||||
retryButton.run(SKAction.repeatForever(pulse))
|
||||
}
|
||||
|
||||
// MARK: - Touch Handling
|
||||
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
guard let touch = touches.first else { return }
|
||||
let location = touch.location(in: self)
|
||||
|
||||
if retryButton.contains(location) {
|
||||
retryGame()
|
||||
} else if menuButton.contains(location) {
|
||||
returnToMenu()
|
||||
}
|
||||
}
|
||||
|
||||
private func retryGame() {
|
||||
let pressDown = SKAction.scale(to: 0.9, duration: 0.1)
|
||||
let pressUp = SKAction.scale(to: 1.0, duration: 0.1)
|
||||
|
||||
retryButton.run(SKAction.sequence([pressDown, pressUp])) { [weak self] in
|
||||
guard let self = self else { return }
|
||||
|
||||
let gameScene = GameScene(size: self.size)
|
||||
gameScene.scaleMode = self.scaleMode
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
self.view?.presentScene(gameScene, transition: transition)
|
||||
}
|
||||
}
|
||||
|
||||
private func returnToMenu() {
|
||||
let pressDown = SKAction.scale(to: 0.9, duration: 0.1)
|
||||
let pressUp = SKAction.scale(to: 1.0, duration: 0.1)
|
||||
|
||||
menuButton.run(SKAction.sequence([pressDown, pressUp])) { [weak self] in
|
||||
guard let self = self else { return }
|
||||
|
||||
let menuScene = MenuScene(size: self.size)
|
||||
menuScene.scaleMode = self.scaleMode
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
self.view?.presentScene(menuScene, transition: transition)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,537 @@
|
||||
//
|
||||
// GameScene.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
class GameScene: SKScene {
|
||||
|
||||
// MARK: - Game Objects
|
||||
private var player: PlayerNode!
|
||||
private var gameState: GameState!
|
||||
|
||||
// MARK: - Managers
|
||||
private var spawnManager: SpawnManager!
|
||||
private var collisionManager: CollisionManager!
|
||||
|
||||
// MARK: - UI Elements
|
||||
private var livesLabel: SKLabelNode!
|
||||
private var scoreLabel: SKLabelNode!
|
||||
private var dogsLabel: SKLabelNode!
|
||||
private var humansLabel: SKLabelNode!
|
||||
private var timerLabel: SKLabelNode!
|
||||
private var pauseButton: SKShapeNode!
|
||||
private var pauseOverlay: SKNode?
|
||||
|
||||
// MARK: - Touch Handling
|
||||
private var touchOffset: CGPoint = .zero
|
||||
private var isDragging: Bool = false
|
||||
|
||||
// MARK: - Timing
|
||||
private var lastUpdateTime: TimeInterval = 0
|
||||
|
||||
// MARK: - Background Scrolling
|
||||
private var floorTiles: [SKShapeNode] = []
|
||||
private let tileSize: CGFloat = 80
|
||||
|
||||
// MARK: - Scene Lifecycle
|
||||
override func didMove(to view: SKView) {
|
||||
setupGame()
|
||||
}
|
||||
|
||||
// MARK: - Setup
|
||||
private func setupGame() {
|
||||
// Initialize game state
|
||||
gameState = GameState()
|
||||
gameState.reset()
|
||||
|
||||
// Setup physics
|
||||
physicsWorld.gravity = .zero
|
||||
collisionManager = CollisionManager()
|
||||
collisionManager.delegate = self
|
||||
collisionManager.setScene(self)
|
||||
physicsWorld.contactDelegate = collisionManager
|
||||
|
||||
setupBackground()
|
||||
setupPlayer()
|
||||
setupUI()
|
||||
setupSpawnManager()
|
||||
|
||||
spawnManager.startSpawning()
|
||||
}
|
||||
|
||||
private func setupBackground() {
|
||||
backgroundColor = Constants.Colors.backgroundColor
|
||||
|
||||
// Create scrolling floor tiles
|
||||
let rows = Int(frame.height / tileSize) + 3
|
||||
let cols = Int(frame.width / tileSize) + 1
|
||||
|
||||
for row in 0..<rows {
|
||||
for col in 0..<cols {
|
||||
let tile = SKShapeNode(rect: CGRect(x: 0, y: 0,
|
||||
width: tileSize - 2, height: tileSize - 2))
|
||||
let isEven = (row + col) % 2 == 0
|
||||
tile.fillColor = isEven ?
|
||||
SKColor(white: 0.78, alpha: 1.0) : SKColor(white: 0.72, alpha: 1.0)
|
||||
tile.strokeColor = SKColor(white: 0.65, alpha: 0.5)
|
||||
tile.lineWidth = 1
|
||||
tile.position = CGPoint(x: CGFloat(col) * tileSize,
|
||||
y: CGFloat(row) * tileSize)
|
||||
tile.zPosition = Constants.ZPosition.floor
|
||||
tile.name = "floorTile"
|
||||
addChild(tile)
|
||||
floorTiles.append(tile)
|
||||
}
|
||||
}
|
||||
|
||||
// Add airport markings
|
||||
addAirportMarkings()
|
||||
}
|
||||
|
||||
private func addAirportMarkings() {
|
||||
// Center line
|
||||
let lineWidth: CGFloat = 4
|
||||
let dashLength: CGFloat = 30
|
||||
let gapLength: CGFloat = 20
|
||||
|
||||
for y in stride(from: CGFloat(0), to: frame.height, by: dashLength + gapLength) {
|
||||
let dash = SKShapeNode(rect: CGRect(x: frame.midX - lineWidth / 2, y: y,
|
||||
width: lineWidth, height: dashLength))
|
||||
dash.fillColor = SKColor.yellow.withAlphaComponent(0.6)
|
||||
dash.strokeColor = .clear
|
||||
dash.zPosition = Constants.ZPosition.floor + 0.5
|
||||
dash.name = "floorMarking"
|
||||
addChild(dash)
|
||||
}
|
||||
}
|
||||
|
||||
private func setupPlayer() {
|
||||
player = PlayerNode()
|
||||
player.position = CGPoint(x: frame.midX, y: frame.height * 0.15)
|
||||
addChild(player)
|
||||
}
|
||||
|
||||
private func setupUI() {
|
||||
let uiY = frame.height - 50
|
||||
let uiY2 = frame.height - 80
|
||||
|
||||
// Lives
|
||||
livesLabel = createUILabel(text: gameState.formattedLives, fontSize: 24)
|
||||
livesLabel.position = CGPoint(x: 60, y: uiY)
|
||||
livesLabel.horizontalAlignmentMode = .left
|
||||
addChild(livesLabel)
|
||||
|
||||
// Score
|
||||
scoreLabel = createUILabel(text: gameState.formattedScore, fontSize: 20)
|
||||
scoreLabel.position = CGPoint(x: frame.midX, y: uiY)
|
||||
addChild(scoreLabel)
|
||||
|
||||
// Dogs counter
|
||||
dogsLabel = createUILabel(text: gameState.formattedDogs, fontSize: 18)
|
||||
dogsLabel.position = CGPoint(x: frame.width - 120, y: uiY)
|
||||
addChild(dogsLabel)
|
||||
|
||||
// Humans counter
|
||||
humansLabel = createUILabel(text: gameState.formattedHumans, fontSize: 18)
|
||||
humansLabel.position = CGPoint(x: frame.width - 50, y: uiY)
|
||||
addChild(humansLabel)
|
||||
|
||||
// Timer
|
||||
timerLabel = createUILabel(text: "⏱️ \(gameState.formattedTime)", fontSize: 22)
|
||||
timerLabel.position = CGPoint(x: frame.midX, y: uiY2)
|
||||
addChild(timerLabel)
|
||||
|
||||
// Pause button
|
||||
setupPauseButton()
|
||||
|
||||
// UI background bar
|
||||
let uiBar = SKShapeNode(rect: CGRect(x: 0, y: frame.height - 100,
|
||||
width: frame.width, height: 100))
|
||||
uiBar.fillColor = SKColor.white.withAlphaComponent(0.9)
|
||||
uiBar.strokeColor = SKColor.gray.withAlphaComponent(0.5)
|
||||
uiBar.lineWidth = 1
|
||||
uiBar.zPosition = Constants.ZPosition.ui - 1
|
||||
addChild(uiBar)
|
||||
}
|
||||
|
||||
private func createUILabel(text: String, fontSize: CGFloat) -> SKLabelNode {
|
||||
let label = SKLabelNode(text: text)
|
||||
label.fontName = "AvenirNext-Bold"
|
||||
label.fontSize = fontSize
|
||||
label.fontColor = .darkGray
|
||||
label.zPosition = Constants.ZPosition.ui
|
||||
label.verticalAlignmentMode = .center
|
||||
return label
|
||||
}
|
||||
|
||||
private func setupPauseButton() {
|
||||
let buttonSize: CGFloat = 36
|
||||
pauseButton = SKShapeNode(rect: CGRect(x: -buttonSize / 2, y: -buttonSize / 2,
|
||||
width: buttonSize, height: buttonSize),
|
||||
cornerRadius: 8)
|
||||
pauseButton.fillColor = SKColor(white: 0.9, alpha: 1.0)
|
||||
pauseButton.strokeColor = SKColor.gray
|
||||
pauseButton.lineWidth = 2
|
||||
pauseButton.position = CGPoint(x: 40, y: frame.height - 75)
|
||||
pauseButton.zPosition = Constants.ZPosition.ui
|
||||
pauseButton.name = "pauseButton"
|
||||
addChild(pauseButton)
|
||||
|
||||
// Pause icon (two vertical bars)
|
||||
let barWidth: CGFloat = 4
|
||||
let barHeight: CGFloat = 16
|
||||
let barGap: CGFloat = 5
|
||||
|
||||
let leftBar = SKShapeNode(rect: CGRect(x: -barGap - barWidth / 2, y: -barHeight / 2,
|
||||
width: barWidth, height: barHeight))
|
||||
leftBar.fillColor = .darkGray
|
||||
leftBar.strokeColor = .clear
|
||||
pauseButton.addChild(leftBar)
|
||||
|
||||
let rightBar = SKShapeNode(rect: CGRect(x: barGap - barWidth / 2, y: -barHeight / 2,
|
||||
width: barWidth, height: barHeight))
|
||||
rightBar.fillColor = .darkGray
|
||||
rightBar.strokeColor = .clear
|
||||
pauseButton.addChild(rightBar)
|
||||
}
|
||||
|
||||
private func setupSpawnManager() {
|
||||
spawnManager = SpawnManager(scene: self)
|
||||
}
|
||||
|
||||
// MARK: - Update Loop
|
||||
override func update(_ currentTime: TimeInterval) {
|
||||
guard gameState.currentState == .playing else { return }
|
||||
|
||||
// Calculate delta time
|
||||
let deltaTime = lastUpdateTime > 0 ? currentTime - lastUpdateTime : 0
|
||||
lastUpdateTime = currentTime
|
||||
|
||||
// Update game time
|
||||
gameState.updateTime(delta: deltaTime)
|
||||
updateUI()
|
||||
|
||||
// Update spawn manager
|
||||
spawnManager.update(deltaTime: deltaTime)
|
||||
|
||||
// Update floor scrolling
|
||||
updateFloorScrolling(deltaTime: deltaTime)
|
||||
|
||||
// Check game end conditions
|
||||
checkGameEndConditions()
|
||||
}
|
||||
|
||||
private func updateFloorScrolling(deltaTime: TimeInterval) {
|
||||
let scrollAmount = Constants.scrollSpeed * CGFloat(deltaTime)
|
||||
|
||||
for tile in floorTiles {
|
||||
tile.position.y -= scrollAmount
|
||||
|
||||
// Reset tile position when it scrolls off screen
|
||||
if tile.position.y < -tileSize {
|
||||
tile.position.y += CGFloat(floorTiles.count / (Int(frame.width / tileSize) + 1)) * tileSize
|
||||
}
|
||||
}
|
||||
|
||||
// Also scroll floor markings
|
||||
enumerateChildNodes(withName: "floorMarking") { node, _ in
|
||||
node.position.y -= scrollAmount
|
||||
if node.position.y < -30 {
|
||||
node.position.y += self.frame.height + 50
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func updateUI() {
|
||||
livesLabel.text = gameState.formattedLives
|
||||
scoreLabel.text = gameState.formattedScore
|
||||
dogsLabel.text = gameState.formattedDogs
|
||||
humansLabel.text = gameState.formattedHumans
|
||||
timerLabel.text = "⏱️ \(gameState.formattedTime)"
|
||||
|
||||
// Flash timer when low
|
||||
if gameState.timeRemaining <= 10 {
|
||||
timerLabel.fontColor = .red
|
||||
|
||||
if timerLabel.action(forKey: "flash") == nil {
|
||||
let flash = SKAction.sequence([
|
||||
SKAction.scale(to: 1.2, duration: 0.25),
|
||||
SKAction.scale(to: 1.0, duration: 0.25)
|
||||
])
|
||||
timerLabel.run(SKAction.repeatForever(flash), withKey: "flash")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func checkGameEndConditions() {
|
||||
if gameState.hasWon {
|
||||
handleVictory()
|
||||
} else if gameState.hasLost {
|
||||
handleGameOver()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Touch Handling
|
||||
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
guard let touch = touches.first else { return }
|
||||
let location = touch.location(in: self)
|
||||
|
||||
// Check pause button
|
||||
if pauseButton.contains(location) {
|
||||
togglePause()
|
||||
return
|
||||
}
|
||||
|
||||
// Check if touching player for dragging
|
||||
if player.contains(location) {
|
||||
isDragging = true
|
||||
touchOffset = CGPoint(x: player.position.x - location.x,
|
||||
y: player.position.y - location.y)
|
||||
} else {
|
||||
// Move player to touch location
|
||||
isDragging = true
|
||||
touchOffset = .zero
|
||||
player.position = location
|
||||
player.constrainToScreen(in: frame)
|
||||
}
|
||||
}
|
||||
|
||||
override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
guard isDragging, gameState.currentState == .playing,
|
||||
let touch = touches.first else { return }
|
||||
|
||||
let location = touch.location(in: self)
|
||||
player.position = CGPoint(x: location.x + touchOffset.x,
|
||||
y: location.y + touchOffset.y)
|
||||
player.constrainToScreen(in: frame)
|
||||
}
|
||||
|
||||
override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
isDragging = false
|
||||
}
|
||||
|
||||
override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
isDragging = false
|
||||
}
|
||||
|
||||
// MARK: - Pause Handling
|
||||
private func togglePause() {
|
||||
if gameState.currentState == .playing {
|
||||
pauseGame()
|
||||
} else if gameState.currentState == .paused {
|
||||
resumeGame()
|
||||
}
|
||||
}
|
||||
|
||||
private func pauseGame() {
|
||||
gameState.setState(.paused)
|
||||
spawnManager.stopSpawning()
|
||||
isPaused = true
|
||||
|
||||
showPauseOverlay()
|
||||
}
|
||||
|
||||
private func resumeGame() {
|
||||
hidePauseOverlay()
|
||||
|
||||
gameState.setState(.playing)
|
||||
spawnManager.startSpawning()
|
||||
isPaused = false
|
||||
lastUpdateTime = 0
|
||||
}
|
||||
|
||||
private func showPauseOverlay() {
|
||||
pauseOverlay = SKNode()
|
||||
pauseOverlay?.zPosition = Constants.ZPosition.ui + 10
|
||||
|
||||
// Dimmed background
|
||||
let dim = SKShapeNode(rect: frame)
|
||||
dim.fillColor = SKColor.black.withAlphaComponent(0.6)
|
||||
dim.strokeColor = .clear
|
||||
pauseOverlay?.addChild(dim)
|
||||
|
||||
// Pause text
|
||||
let pauseText = SKLabelNode(text: "⏸️ PAUSIERT")
|
||||
pauseText.fontName = "AvenirNext-Heavy"
|
||||
pauseText.fontSize = 40
|
||||
pauseText.fontColor = .white
|
||||
pauseText.position = CGPoint(x: frame.midX, y: frame.midY + 40)
|
||||
pauseOverlay?.addChild(pauseText)
|
||||
|
||||
// Resume button
|
||||
let resumeButton = createButton(text: "▶️ Weiter", at: CGPoint(x: frame.midX, y: frame.midY - 20))
|
||||
resumeButton.name = "resumeButton"
|
||||
pauseOverlay?.addChild(resumeButton)
|
||||
|
||||
// Menu button
|
||||
let menuButton = createButton(text: "🏠 Menü", at: CGPoint(x: frame.midX, y: frame.midY - 80))
|
||||
menuButton.name = "menuButton"
|
||||
pauseOverlay?.addChild(menuButton)
|
||||
|
||||
addChild(pauseOverlay!)
|
||||
}
|
||||
|
||||
private func createButton(text: String, at position: CGPoint) -> SKNode {
|
||||
let container = SKNode()
|
||||
container.position = position
|
||||
|
||||
let bg = SKShapeNode(rect: CGRect(x: -80, y: -25, width: 160, height: 50),
|
||||
cornerRadius: 10)
|
||||
bg.fillColor = SKColor(white: 0.2, alpha: 0.9)
|
||||
bg.strokeColor = .white
|
||||
bg.lineWidth = 2
|
||||
container.addChild(bg)
|
||||
|
||||
let label = SKLabelNode(text: text)
|
||||
label.fontName = "AvenirNext-Bold"
|
||||
label.fontSize = 22
|
||||
label.fontColor = .white
|
||||
label.verticalAlignmentMode = .center
|
||||
container.addChild(label)
|
||||
|
||||
return container
|
||||
}
|
||||
|
||||
private func hidePauseOverlay() {
|
||||
pauseOverlay?.removeFromParent()
|
||||
pauseOverlay = nil
|
||||
}
|
||||
|
||||
// MARK: - Handle pause overlay touches (override to handle when paused)
|
||||
func handlePauseOverlayTouch(at location: CGPoint) {
|
||||
guard let overlay = pauseOverlay else { return }
|
||||
|
||||
if let resumeButton = overlay.childNode(withName: "resumeButton"),
|
||||
resumeButton.contains(location) {
|
||||
resumeGame()
|
||||
} else if let menuButton = overlay.childNode(withName: "menuButton"),
|
||||
menuButton.contains(location) {
|
||||
returnToMenu()
|
||||
}
|
||||
}
|
||||
|
||||
// Override touchesBegan to handle pause overlay
|
||||
func handleTouchInPausedState(_ touches: Set<UITouch>) {
|
||||
guard let touch = touches.first else { return }
|
||||
let location = touch.location(in: self)
|
||||
handlePauseOverlayTouch(at: location)
|
||||
}
|
||||
|
||||
// MARK: - Game End Handling
|
||||
private func handleDamage() {
|
||||
guard !gameState.isInvincible else { return }
|
||||
|
||||
if gameState.loseLife() {
|
||||
// Start invincibility
|
||||
gameState.isInvincible = true
|
||||
player.startBlinking()
|
||||
|
||||
// End invincibility after duration
|
||||
let wait = SKAction.wait(forDuration: Constants.invincibilityDuration)
|
||||
run(wait) { [weak self] in
|
||||
self?.gameState.isInvincible = false
|
||||
self?.player.stopBlinking()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func handleVictory() {
|
||||
gameState.setState(.victory)
|
||||
spawnManager.stopSpawning()
|
||||
|
||||
// Record score
|
||||
ScoreManager.shared.recordGameEnd(
|
||||
score: gameState.score,
|
||||
dogsCollected: gameState.dogsCollected,
|
||||
humansCollected: gameState.humansCollected,
|
||||
didWin: true
|
||||
)
|
||||
|
||||
// Transition to victory scene
|
||||
let victoryScene = VictoryScene(size: size)
|
||||
victoryScene.scaleMode = scaleMode
|
||||
victoryScene.finalScore = gameState.score
|
||||
victoryScene.dogsCollected = gameState.dogsCollected
|
||||
victoryScene.humansCollected = gameState.humansCollected
|
||||
victoryScene.timeRemaining = gameState.timeRemaining
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
view?.presentScene(victoryScene, transition: transition)
|
||||
}
|
||||
|
||||
private func handleGameOver() {
|
||||
gameState.setState(.gameOver)
|
||||
spawnManager.stopSpawning()
|
||||
|
||||
// Record score
|
||||
ScoreManager.shared.recordGameEnd(
|
||||
score: gameState.score,
|
||||
dogsCollected: gameState.dogsCollected,
|
||||
humansCollected: gameState.humansCollected,
|
||||
didWin: false
|
||||
)
|
||||
|
||||
// Transition to game over scene
|
||||
let gameOverScene = GameOverScene(size: size)
|
||||
gameOverScene.scaleMode = scaleMode
|
||||
gameOverScene.finalScore = gameState.score
|
||||
gameOverScene.dogsCollected = gameState.dogsCollected
|
||||
gameOverScene.humansCollected = gameState.humansCollected
|
||||
gameOverScene.isNewHighScore = ScoreManager.shared.isNewHighScore(gameState.score)
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
view?.presentScene(gameOverScene, transition: transition)
|
||||
}
|
||||
|
||||
private func returnToMenu() {
|
||||
let menuScene = MenuScene(size: size)
|
||||
menuScene.scaleMode = scaleMode
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
view?.presentScene(menuScene, transition: transition)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - CollisionManagerDelegate
|
||||
extension GameScene: CollisionManagerDelegate {
|
||||
func didCollectGoodDog(points: Int) {
|
||||
gameState.addPoints(points)
|
||||
gameState.collectDog()
|
||||
|
||||
// Show collection effect
|
||||
showPointsEffect(points: points, at: player.position)
|
||||
}
|
||||
|
||||
func didCollectGreenHuman(points: Int) {
|
||||
gameState.addPoints(points)
|
||||
gameState.collectHuman()
|
||||
|
||||
// Show collection effect
|
||||
showPointsEffect(points: points, at: player.position)
|
||||
}
|
||||
|
||||
func didHitHarmfulEntity() {
|
||||
handleDamage()
|
||||
}
|
||||
|
||||
private func showPointsEffect(points: Int, at position: CGPoint) {
|
||||
let label = SKLabelNode(text: "+\(points)")
|
||||
label.fontName = "AvenirNext-Bold"
|
||||
label.fontSize = 24
|
||||
label.fontColor = .green
|
||||
label.position = CGPoint(x: position.x, y: position.y + 50)
|
||||
label.zPosition = Constants.ZPosition.ui
|
||||
|
||||
addChild(label)
|
||||
|
||||
let moveUp = SKAction.moveBy(x: 0, y: 40, duration: 0.5)
|
||||
let fadeOut = SKAction.fadeOut(withDuration: 0.5)
|
||||
let group = SKAction.group([moveUp, fadeOut])
|
||||
let remove = SKAction.removeFromParent()
|
||||
label.run(SKAction.sequence([group, remove]))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,265 @@
|
||||
//
|
||||
// MenuScene.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
class MenuScene: SKScene {
|
||||
|
||||
// MARK: - Properties
|
||||
private var startButton: SKShapeNode!
|
||||
private var titleLabel: SKLabelNode!
|
||||
private var subtitleLabel: SKLabelNode!
|
||||
private var highScoreLabel: SKLabelNode!
|
||||
private var creditsLabel: SKLabelNode!
|
||||
|
||||
// MARK: - Decorative elements
|
||||
private var decorativeSuitcase: PlayerNode!
|
||||
private var decorativeDogs: [DogNode] = []
|
||||
private var decorativeHumans: [HumanNode] = []
|
||||
|
||||
// MARK: - Scene Lifecycle
|
||||
override func didMove(to view: SKView) {
|
||||
setupBackground()
|
||||
setupTitle()
|
||||
setupStartButton()
|
||||
setupHighScore()
|
||||
setupDecorations()
|
||||
setupCredits()
|
||||
startAnimations()
|
||||
}
|
||||
|
||||
// MARK: - Setup
|
||||
private func setupBackground() {
|
||||
backgroundColor = Constants.Colors.backgroundColor
|
||||
|
||||
// Create floor pattern
|
||||
let floorHeight = frame.height * 0.6
|
||||
let floor = SKShapeNode(rect: CGRect(x: 0, y: 0,
|
||||
width: frame.width, height: floorHeight))
|
||||
floor.fillColor = Constants.Colors.floorColor
|
||||
floor.strokeColor = .clear
|
||||
floor.zPosition = Constants.ZPosition.floor
|
||||
addChild(floor)
|
||||
|
||||
// Add floor tiles pattern
|
||||
let tileSize: CGFloat = 80
|
||||
for x in stride(from: CGFloat(0), to: frame.width, by: tileSize) {
|
||||
for y in stride(from: CGFloat(0), to: floorHeight, by: tileSize) {
|
||||
let tile = SKShapeNode(rect: CGRect(x: x, y: y,
|
||||
width: tileSize - 2, height: tileSize - 2))
|
||||
tile.fillColor = (Int((x + y) / tileSize) % 2 == 0) ?
|
||||
SKColor(white: 0.78, alpha: 1.0) : SKColor(white: 0.72, alpha: 1.0)
|
||||
tile.strokeColor = SKColor(white: 0.65, alpha: 0.5)
|
||||
tile.lineWidth = 1
|
||||
tile.zPosition = Constants.ZPosition.floor + 0.1
|
||||
addChild(tile)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func setupTitle() {
|
||||
// Main title
|
||||
titleLabel = SKLabelNode(text: "🧳 Rollkoffer Simulator 🧳")
|
||||
titleLabel.fontName = "AvenirNext-Heavy"
|
||||
titleLabel.fontSize = 36
|
||||
titleLabel.fontColor = SKColor(red: 0.3, green: 0.2, blue: 0.5, alpha: 1.0)
|
||||
titleLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.85)
|
||||
titleLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(titleLabel)
|
||||
|
||||
// Subtitle
|
||||
subtitleLabel = SKLabelNode(text: "Sammle Hunde & Menschen am Flughafen!")
|
||||
subtitleLabel.fontName = "AvenirNext-Medium"
|
||||
subtitleLabel.fontSize = 18
|
||||
subtitleLabel.fontColor = SKColor.darkGray
|
||||
subtitleLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.78)
|
||||
subtitleLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(subtitleLabel)
|
||||
|
||||
// Goal info
|
||||
let goalLabel = SKLabelNode(text: "Ziel: 🐕 10 Hunde + 👤 5 Grüne Menschen")
|
||||
goalLabel.fontName = "AvenirNext-Medium"
|
||||
goalLabel.fontSize = 16
|
||||
goalLabel.fontColor = SKColor.gray
|
||||
goalLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.72)
|
||||
goalLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(goalLabel)
|
||||
}
|
||||
|
||||
private func setupStartButton() {
|
||||
// Button background
|
||||
let buttonWidth: CGFloat = 200
|
||||
let buttonHeight: CGFloat = 60
|
||||
|
||||
startButton = SKShapeNode(rect: CGRect(x: -buttonWidth / 2, y: -buttonHeight / 2,
|
||||
width: buttonWidth, height: buttonHeight),
|
||||
cornerRadius: 15)
|
||||
startButton.fillColor = SKColor(red: 0.2, green: 0.7, blue: 0.3, alpha: 1.0)
|
||||
startButton.strokeColor = SKColor(red: 0.15, green: 0.5, blue: 0.2, alpha: 1.0)
|
||||
startButton.lineWidth = 3
|
||||
startButton.position = CGPoint(x: frame.midX, y: frame.height * 0.5)
|
||||
startButton.zPosition = Constants.ZPosition.ui
|
||||
startButton.name = "startButton"
|
||||
addChild(startButton)
|
||||
|
||||
// Button label
|
||||
let buttonLabel = SKLabelNode(text: "▶ START")
|
||||
buttonLabel.fontName = "AvenirNext-Bold"
|
||||
buttonLabel.fontSize = 28
|
||||
buttonLabel.fontColor = .white
|
||||
buttonLabel.verticalAlignmentMode = .center
|
||||
buttonLabel.position = .zero
|
||||
buttonLabel.zPosition = 1
|
||||
startButton.addChild(buttonLabel)
|
||||
|
||||
// Button pulse animation
|
||||
let scaleUp = SKAction.scale(to: 1.05, duration: 0.8)
|
||||
let scaleDown = SKAction.scale(to: 1.0, duration: 0.8)
|
||||
let pulse = SKAction.sequence([scaleUp, scaleDown])
|
||||
startButton.run(SKAction.repeatForever(pulse))
|
||||
}
|
||||
|
||||
private func setupHighScore() {
|
||||
let highScore = ScoreManager.shared.highScore
|
||||
|
||||
highScoreLabel = SKLabelNode(text: "🏆 High Score: \(highScore)")
|
||||
highScoreLabel.fontName = "AvenirNext-DemiBold"
|
||||
highScoreLabel.fontSize = 20
|
||||
highScoreLabel.fontColor = SKColor(red: 0.8, green: 0.6, blue: 0.1, alpha: 1.0)
|
||||
highScoreLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.38)
|
||||
highScoreLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(highScoreLabel)
|
||||
|
||||
// Statistics label
|
||||
let victories = ScoreManager.shared.victories
|
||||
let gamesPlayed = ScoreManager.shared.gamesPlayed
|
||||
let statsText = "Siege: \(victories) | Spiele: \(gamesPlayed)"
|
||||
|
||||
let statsLabel = SKLabelNode(text: statsText)
|
||||
statsLabel.fontName = "AvenirNext-Regular"
|
||||
statsLabel.fontSize = 14
|
||||
statsLabel.fontColor = SKColor.gray
|
||||
statsLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.33)
|
||||
statsLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(statsLabel)
|
||||
}
|
||||
|
||||
private func setupDecorations() {
|
||||
// Decorative suitcase
|
||||
decorativeSuitcase = PlayerNode()
|
||||
decorativeSuitcase.position = CGPoint(x: frame.midX, y: frame.height * 0.2)
|
||||
decorativeSuitcase.zPosition = Constants.ZPosition.entities
|
||||
addChild(decorativeSuitcase)
|
||||
|
||||
// Add some decorative dogs
|
||||
let dogTypes: [DogType] = [.smallGood, .bigGood, .bad]
|
||||
let dogPositions: [CGPoint] = [
|
||||
CGPoint(x: frame.width * 0.15, y: frame.height * 0.25),
|
||||
CGPoint(x: frame.width * 0.85, y: frame.height * 0.22),
|
||||
CGPoint(x: frame.width * 0.25, y: frame.height * 0.12)
|
||||
]
|
||||
|
||||
for (index, type) in dogTypes.enumerated() {
|
||||
let dog = DogNode(type: type)
|
||||
dog.position = dogPositions[index]
|
||||
dog.zPosition = Constants.ZPosition.entities
|
||||
addChild(dog)
|
||||
decorativeDogs.append(dog)
|
||||
}
|
||||
|
||||
// Add decorative humans
|
||||
let humanTypes: [HumanType] = [.green, .gray]
|
||||
let humanPositions: [CGPoint] = [
|
||||
CGPoint(x: frame.width * 0.75, y: frame.height * 0.15),
|
||||
CGPoint(x: frame.width * 0.6, y: frame.height * 0.1)
|
||||
]
|
||||
|
||||
for (index, type) in humanTypes.enumerated() {
|
||||
let human = HumanNode(type: type)
|
||||
human.position = humanPositions[index]
|
||||
human.zPosition = Constants.ZPosition.entities
|
||||
addChild(human)
|
||||
decorativeHumans.append(human)
|
||||
}
|
||||
}
|
||||
|
||||
private func setupCredits() {
|
||||
creditsLabel = SKLabelNode(text: "Created by Ingo K.")
|
||||
creditsLabel.fontName = "AvenirNext-Italic"
|
||||
creditsLabel.fontSize = 14
|
||||
creditsLabel.fontColor = SKColor.gray
|
||||
creditsLabel.position = CGPoint(x: frame.midX, y: 30)
|
||||
creditsLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(creditsLabel)
|
||||
}
|
||||
|
||||
private func startAnimations() {
|
||||
// Animate decorative suitcase
|
||||
let moveLeft = SKAction.moveBy(x: -20, y: 0, duration: 1.5)
|
||||
let moveRight = SKAction.moveBy(x: 40, y: 0, duration: 3.0)
|
||||
let moveBack = SKAction.moveBy(x: -20, y: 0, duration: 1.5)
|
||||
let suitcaseSequence = SKAction.sequence([moveLeft, moveRight, moveBack])
|
||||
decorativeSuitcase.run(SKAction.repeatForever(suitcaseSequence))
|
||||
|
||||
// Animate decorative entities
|
||||
for (index, dog) in decorativeDogs.enumerated() {
|
||||
let delay = Double(index) * 0.3
|
||||
let bounce = SKAction.sequence([
|
||||
SKAction.wait(forDuration: delay),
|
||||
SKAction.moveBy(x: 0, y: 10, duration: 0.4),
|
||||
SKAction.moveBy(x: 0, y: -10, duration: 0.4)
|
||||
])
|
||||
dog.run(SKAction.repeatForever(bounce))
|
||||
}
|
||||
|
||||
for (index, human) in decorativeHumans.enumerated() {
|
||||
let delay = Double(index) * 0.4 + 0.2
|
||||
let sway = SKAction.sequence([
|
||||
SKAction.wait(forDuration: delay),
|
||||
SKAction.rotate(byAngle: 0.05, duration: 0.5),
|
||||
SKAction.rotate(byAngle: -0.1, duration: 1.0),
|
||||
SKAction.rotate(byAngle: 0.05, duration: 0.5)
|
||||
])
|
||||
human.run(SKAction.repeatForever(sway))
|
||||
}
|
||||
|
||||
// Title animation
|
||||
let titleScale = SKAction.sequence([
|
||||
SKAction.scale(to: 1.02, duration: 2.0),
|
||||
SKAction.scale(to: 1.0, duration: 2.0)
|
||||
])
|
||||
titleLabel.run(SKAction.repeatForever(titleScale))
|
||||
}
|
||||
|
||||
// MARK: - Touch Handling
|
||||
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
guard let touch = touches.first else { return }
|
||||
let location = touch.location(in: self)
|
||||
|
||||
if startButton.contains(location) {
|
||||
startGame()
|
||||
}
|
||||
}
|
||||
|
||||
private func startGame() {
|
||||
// Button press effect
|
||||
let pressDown = SKAction.scale(to: 0.9, duration: 0.1)
|
||||
let pressUp = SKAction.scale(to: 1.0, duration: 0.1)
|
||||
|
||||
startButton.run(SKAction.sequence([pressDown, pressUp])) { [weak self] in
|
||||
self?.transitionToGame()
|
||||
}
|
||||
}
|
||||
|
||||
private func transitionToGame() {
|
||||
let gameScene = GameScene(size: size)
|
||||
gameScene.scaleMode = scaleMode
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
view?.presentScene(gameScene, transition: transition)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,312 @@
|
||||
//
|
||||
// VictoryScene.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
class VictoryScene: SKScene {
|
||||
|
||||
// MARK: - Properties
|
||||
var finalScore: Int = 0
|
||||
var dogsCollected: Int = 0
|
||||
var humansCollected: Int = 0
|
||||
var timeRemaining: TimeInterval = 0
|
||||
|
||||
private var playAgainButton: SKShapeNode!
|
||||
private var menuButton: SKShapeNode!
|
||||
|
||||
// MARK: - Scene Lifecycle
|
||||
override func didMove(to view: SKView) {
|
||||
setupBackground()
|
||||
setupContent()
|
||||
setupButtons()
|
||||
startCelebration()
|
||||
}
|
||||
|
||||
// MARK: - Setup
|
||||
private func setupBackground() {
|
||||
backgroundColor = SKColor(red: 0.1, green: 0.2, blue: 0.1, alpha: 1.0)
|
||||
|
||||
// Add celebration particles
|
||||
for _ in 0..<30 {
|
||||
let confetti = createConfetti()
|
||||
addChild(confetti)
|
||||
}
|
||||
}
|
||||
|
||||
private func createConfetti() -> SKShapeNode {
|
||||
let size = CGFloat.random(in: 8...15)
|
||||
let confetti = SKShapeNode(rectOf: CGSize(width: size, height: size * 1.5))
|
||||
confetti.fillColor = [SKColor.red, SKColor.yellow, SKColor.green,
|
||||
SKColor.blue, SKColor.orange, SKColor.purple].randomElement()!
|
||||
confetti.strokeColor = .clear
|
||||
confetti.position = CGPoint(x: CGFloat.random(in: 0...frame.width),
|
||||
y: frame.height + CGFloat.random(in: 50...200))
|
||||
confetti.zPosition = Constants.ZPosition.ui - 5
|
||||
confetti.zRotation = CGFloat.random(in: 0...(.pi * 2))
|
||||
|
||||
// Falling animation
|
||||
let fallDuration = Double.random(in: 3...6)
|
||||
let fall = SKAction.moveTo(y: -50, duration: fallDuration)
|
||||
let rotate = SKAction.rotate(byAngle: .pi * 4, duration: fallDuration)
|
||||
let sway = SKAction.sequence([
|
||||
SKAction.moveBy(x: 30, y: 0, duration: 0.5),
|
||||
SKAction.moveBy(x: -30, y: 0, duration: 0.5)
|
||||
])
|
||||
let swayRepeat = SKAction.repeat(sway, count: Int(fallDuration))
|
||||
|
||||
let group = SKAction.group([fall, rotate, swayRepeat])
|
||||
let reset = SKAction.run { [weak confetti, weak self] in
|
||||
confetti?.position = CGPoint(x: CGFloat.random(in: 0...(self?.frame.width ?? 400)),
|
||||
y: (self?.frame.height ?? 800) + 50)
|
||||
}
|
||||
let sequence = SKAction.sequence([group, reset])
|
||||
confetti.run(SKAction.repeatForever(sequence))
|
||||
|
||||
return confetti
|
||||
}
|
||||
|
||||
private func setupContent() {
|
||||
// Victory title
|
||||
let titleLabel = SKLabelNode(text: "🎉 GEWONNEN! 🎉")
|
||||
titleLabel.fontName = "AvenirNext-Heavy"
|
||||
titleLabel.fontSize = 46
|
||||
titleLabel.fontColor = .yellow
|
||||
titleLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.82)
|
||||
titleLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(titleLabel)
|
||||
|
||||
// Animate title
|
||||
let titlePulse = SKAction.sequence([
|
||||
SKAction.scale(to: 1.1, duration: 0.3),
|
||||
SKAction.scale(to: 1.0, duration: 0.3)
|
||||
])
|
||||
titleLabel.run(SKAction.repeatForever(titlePulse))
|
||||
|
||||
// Subtitle
|
||||
let subtitleLabel = SKLabelNode(text: "Du hast alle Ziele erreicht!")
|
||||
subtitleLabel.fontName = "AvenirNext-Medium"
|
||||
subtitleLabel.fontSize = 20
|
||||
subtitleLabel.fontColor = .white
|
||||
subtitleLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.74)
|
||||
subtitleLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(subtitleLabel)
|
||||
|
||||
// Score display
|
||||
let scoreLabel = SKLabelNode(text: "Endpunktzahl: \(finalScore)")
|
||||
scoreLabel.fontName = "AvenirNext-Bold"
|
||||
scoreLabel.fontSize = 36
|
||||
scoreLabel.fontColor = SKColor(red: 1.0, green: 0.85, blue: 0.0, alpha: 1.0)
|
||||
scoreLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.62)
|
||||
scoreLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(scoreLabel)
|
||||
|
||||
// Time bonus display
|
||||
let timeBonus = Int(timeRemaining) * 5
|
||||
if timeBonus > 0 {
|
||||
let timeBonusLabel = SKLabelNode(text: "⏱️ Zeitbonus: +\(timeBonus) (\(Int(timeRemaining))s übrig)")
|
||||
timeBonusLabel.fontName = "AvenirNext-Medium"
|
||||
timeBonusLabel.fontSize = 18
|
||||
timeBonusLabel.fontColor = SKColor.cyan
|
||||
timeBonusLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.55)
|
||||
timeBonusLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(timeBonusLabel)
|
||||
}
|
||||
|
||||
// Stats display
|
||||
let statsY = frame.height * 0.45
|
||||
|
||||
let dogsLabel = SKLabelNode(text: "🐕 Hunde: \(dogsCollected)")
|
||||
dogsLabel.fontName = "AvenirNext-DemiBold"
|
||||
dogsLabel.fontSize = 22
|
||||
dogsLabel.fontColor = .white
|
||||
dogsLabel.position = CGPoint(x: frame.midX - 80, y: statsY)
|
||||
dogsLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(dogsLabel)
|
||||
|
||||
let humansLabel = SKLabelNode(text: "👤 Menschen: \(humansCollected)")
|
||||
humansLabel.fontName = "AvenirNext-DemiBold"
|
||||
humansLabel.fontSize = 22
|
||||
humansLabel.fontColor = .white
|
||||
humansLabel.position = CGPoint(x: frame.midX + 80, y: statsY)
|
||||
humansLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(humansLabel)
|
||||
|
||||
// Happy suitcase with collected items
|
||||
let happySuitcase = PlayerNode()
|
||||
happySuitcase.position = CGPoint(x: frame.midX, y: frame.height * 0.28)
|
||||
addChild(happySuitcase)
|
||||
|
||||
// Happy face
|
||||
let happyFace = SKLabelNode(text: "😄")
|
||||
happyFace.fontSize = 30
|
||||
happyFace.position = CGPoint(x: frame.midX, y: frame.height * 0.28 + 20)
|
||||
happyFace.zPosition = Constants.ZPosition.ui
|
||||
addChild(happyFace)
|
||||
|
||||
// Add small dogs and humans around suitcase
|
||||
let collectibles = [
|
||||
("🐕", CGPoint(x: -50, y: 0)),
|
||||
("🐕", CGPoint(x: 50, y: 0)),
|
||||
("👤", CGPoint(x: -35, y: 30)),
|
||||
("👤", CGPoint(x: 35, y: 30))
|
||||
]
|
||||
|
||||
for (emoji, offset) in collectibles {
|
||||
let label = SKLabelNode(text: emoji)
|
||||
label.fontSize = 24
|
||||
label.position = CGPoint(x: frame.midX + offset.x,
|
||||
y: frame.height * 0.28 + offset.y)
|
||||
label.zPosition = Constants.ZPosition.ui
|
||||
addChild(label)
|
||||
|
||||
// Bounce animation
|
||||
let bounce = SKAction.sequence([
|
||||
SKAction.moveBy(x: 0, y: 5, duration: 0.3),
|
||||
SKAction.moveBy(x: 0, y: -5, duration: 0.3)
|
||||
])
|
||||
label.run(SKAction.repeatForever(bounce))
|
||||
}
|
||||
|
||||
// High score check
|
||||
if ScoreManager.shared.isNewHighScore(finalScore) {
|
||||
let highScoreLabel = SKLabelNode(text: "🏆 NEUER HIGHSCORE! 🏆")
|
||||
highScoreLabel.fontName = "AvenirNext-Heavy"
|
||||
highScoreLabel.fontSize = 26
|
||||
highScoreLabel.fontColor = SKColor.yellow
|
||||
highScoreLabel.position = CGPoint(x: frame.midX, y: frame.height * 0.68)
|
||||
highScoreLabel.zPosition = Constants.ZPosition.ui
|
||||
addChild(highScoreLabel)
|
||||
|
||||
let glow = SKAction.sequence([
|
||||
SKAction.fadeAlpha(to: 0.6, duration: 0.4),
|
||||
SKAction.fadeAlpha(to: 1.0, duration: 0.4)
|
||||
])
|
||||
highScoreLabel.run(SKAction.repeatForever(glow))
|
||||
}
|
||||
}
|
||||
|
||||
private func setupButtons() {
|
||||
// Play Again button
|
||||
playAgainButton = createButton(text: "🎮 Nochmal spielen",
|
||||
color: SKColor(red: 0.2, green: 0.7, blue: 0.3, alpha: 1.0))
|
||||
playAgainButton.position = CGPoint(x: frame.midX, y: frame.height * 0.13)
|
||||
playAgainButton.name = "playAgainButton"
|
||||
addChild(playAgainButton)
|
||||
|
||||
// Menu button
|
||||
menuButton = createButton(text: "🏠 Hauptmenü",
|
||||
color: SKColor(red: 0.3, green: 0.3, blue: 0.6, alpha: 1.0))
|
||||
menuButton.position = CGPoint(x: frame.midX, y: frame.height * 0.06)
|
||||
menuButton.name = "menuButton"
|
||||
addChild(menuButton)
|
||||
}
|
||||
|
||||
private func createButton(text: String, color: SKColor) -> SKShapeNode {
|
||||
let buttonWidth: CGFloat = 220
|
||||
let buttonHeight: CGFloat = 50
|
||||
|
||||
let button = SKShapeNode(rect: CGRect(x: -buttonWidth / 2, y: -buttonHeight / 2,
|
||||
width: buttonWidth, height: buttonHeight),
|
||||
cornerRadius: 12)
|
||||
button.fillColor = color
|
||||
button.strokeColor = .white.withAlphaComponent(0.5)
|
||||
button.lineWidth = 2
|
||||
button.zPosition = Constants.ZPosition.ui
|
||||
|
||||
let label = SKLabelNode(text: text)
|
||||
label.fontName = "AvenirNext-Bold"
|
||||
label.fontSize = 20
|
||||
label.fontColor = .white
|
||||
label.verticalAlignmentMode = .center
|
||||
label.zPosition = 1
|
||||
button.addChild(label)
|
||||
|
||||
return button
|
||||
}
|
||||
|
||||
private func startCelebration() {
|
||||
// Screen flash
|
||||
let flash = SKShapeNode(rect: frame)
|
||||
flash.fillColor = .white
|
||||
flash.strokeColor = .clear
|
||||
flash.zPosition = Constants.ZPosition.ui + 100
|
||||
flash.alpha = 0.8
|
||||
addChild(flash)
|
||||
|
||||
let fadeOut = SKAction.fadeOut(withDuration: 0.5)
|
||||
let remove = SKAction.removeFromParent()
|
||||
flash.run(SKAction.sequence([fadeOut, remove]))
|
||||
|
||||
// Star burst effect
|
||||
for _ in 0..<12 {
|
||||
let star = SKLabelNode(text: "⭐")
|
||||
star.fontSize = CGFloat.random(in: 20...40)
|
||||
star.position = CGPoint(x: frame.midX, y: frame.height * 0.82)
|
||||
star.zPosition = Constants.ZPosition.ui - 1
|
||||
star.alpha = 0
|
||||
addChild(star)
|
||||
|
||||
let angle = CGFloat.random(in: 0...(.pi * 2))
|
||||
let distance = CGFloat.random(in: 100...200)
|
||||
let endPoint = CGPoint(x: frame.midX + cos(angle) * distance,
|
||||
y: frame.height * 0.82 + sin(angle) * distance)
|
||||
|
||||
let fadeIn = SKAction.fadeIn(withDuration: 0.2)
|
||||
let move = SKAction.move(to: endPoint, duration: 0.5)
|
||||
let fadeOutStar = SKAction.fadeOut(withDuration: 0.3)
|
||||
let removeStar = SKAction.removeFromParent()
|
||||
|
||||
let group = SKAction.group([move, SKAction.sequence([fadeIn,
|
||||
SKAction.wait(forDuration: 0.2),
|
||||
fadeOutStar])])
|
||||
star.run(SKAction.sequence([SKAction.wait(forDuration: Double.random(in: 0...0.3)),
|
||||
group, removeStar]))
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Touch Handling
|
||||
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
guard let touch = touches.first else { return }
|
||||
let location = touch.location(in: self)
|
||||
|
||||
if playAgainButton.contains(location) {
|
||||
playAgain()
|
||||
} else if menuButton.contains(location) {
|
||||
returnToMenu()
|
||||
}
|
||||
}
|
||||
|
||||
private func playAgain() {
|
||||
let pressDown = SKAction.scale(to: 0.9, duration: 0.1)
|
||||
let pressUp = SKAction.scale(to: 1.0, duration: 0.1)
|
||||
|
||||
playAgainButton.run(SKAction.sequence([pressDown, pressUp])) { [weak self] in
|
||||
guard let self = self else { return }
|
||||
|
||||
let gameScene = GameScene(size: self.size)
|
||||
gameScene.scaleMode = self.scaleMode
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
self.view?.presentScene(gameScene, transition: transition)
|
||||
}
|
||||
}
|
||||
|
||||
private func returnToMenu() {
|
||||
let pressDown = SKAction.scale(to: 0.9, duration: 0.1)
|
||||
let pressUp = SKAction.scale(to: 1.0, duration: 0.1)
|
||||
|
||||
menuButton.run(SKAction.sequence([pressDown, pressUp])) { [weak self] in
|
||||
guard let self = self else { return }
|
||||
|
||||
let menuScene = MenuScene(size: self.size)
|
||||
menuScene.scaleMode = self.scaleMode
|
||||
|
||||
let transition = SKTransition.fade(withDuration: 0.5)
|
||||
self.view?.presentScene(menuScene, transition: transition)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
//
|
||||
// Constants.swift
|
||||
// RollkofferSimulator
|
||||
//
|
||||
// Created by Ingo K.
|
||||
//
|
||||
|
||||
import SpriteKit
|
||||
|
||||
struct Constants {
|
||||
|
||||
// MARK: - Game Settings
|
||||
static let gameTime: TimeInterval = 90.0
|
||||
static let startLives: Int = 3
|
||||
static let targetDogs: Int = 10
|
||||
static let targetHumans: Int = 5
|
||||
|
||||
// MARK: - Points
|
||||
static let pointsSmallGoodDog: Int = 10
|
||||
static let pointsBigGoodDog: Int = 25
|
||||
static let pointsGreenHuman: Int = 15
|
||||
|
||||
// MARK: - Spawn Settings
|
||||
static let spawnIntervalMin: TimeInterval = 0.8
|
||||
static let spawnIntervalMax: TimeInterval = 1.5
|
||||
static let scrollSpeed: CGFloat = 200.0
|
||||
|
||||
// MARK: - Spawn Distribution (cumulative percentages)
|
||||
static let spawnChanceGoodDog: Int = 40 // 0-39: good dogs
|
||||
static let spawnChanceBadDog: Int = 60 // 40-59: bad dogs (20%)
|
||||
static let spawnChanceGreenHuman: Int = 85 // 60-84: green humans (25%)
|
||||
// 85-99: gray humans (15%)
|
||||
|
||||
// MARK: - Sprite Sizes
|
||||
static let suitcaseSize = CGSize(width: 60, height: 80)
|
||||
static let smallDogSize = CGSize(width: 40, height: 40)
|
||||
static let bigDogSize = CGSize(width: 70, height: 70)
|
||||
static let badDogSize = CGSize(width: 55, height: 55)
|
||||
static let humanSize = CGSize(width: 50, height: 80)
|
||||
|
||||
// MARK: - Physics Categories (Bitmasks)
|
||||
struct PhysicsCategory {
|
||||
static let none: UInt32 = 0
|
||||
static let suitcase: UInt32 = 0x1 << 0
|
||||
static let goodDog: UInt32 = 0x1 << 1
|
||||
static let badDog: UInt32 = 0x1 << 2
|
||||
static let greenHuman: UInt32 = 0x1 << 3
|
||||
static let grayHuman: UInt32 = 0x1 << 4
|
||||
|
||||
static let collectible: UInt32 = goodDog | greenHuman
|
||||
static let harmful: UInt32 = badDog | grayHuman
|
||||
static let all: UInt32 = goodDog | badDog | greenHuman | grayHuman
|
||||
}
|
||||
|
||||
// MARK: - Colors
|
||||
struct Colors {
|
||||
static let goodDogColor = SKColor(red: 0.85, green: 0.65, blue: 0.13, alpha: 1.0) // Gold brown
|
||||
static let badDogColor = SKColor.red
|
||||
static let greenHumanColor = SKColor(red: 0.2, green: 0.8, blue: 0.2, alpha: 1.0)
|
||||
static let grayHumanColor = SKColor.gray
|
||||
static let suitcaseColor = SKColor(red: 0.4, green: 0.3, blue: 0.6, alpha: 1.0)
|
||||
static let backgroundColor = SKColor(red: 0.9, green: 0.9, blue: 0.85, alpha: 1.0)
|
||||
static let floorColor = SKColor(red: 0.75, green: 0.75, blue: 0.7, alpha: 1.0)
|
||||
}
|
||||
|
||||
// MARK: - Z-Positions
|
||||
struct ZPosition {
|
||||
static let background: CGFloat = 0
|
||||
static let floor: CGFloat = 1
|
||||
static let entities: CGFloat = 10
|
||||
static let player: CGFloat = 20
|
||||
static let ui: CGFloat = 100
|
||||
}
|
||||
|
||||
// MARK: - Animation
|
||||
static let blinkDuration: TimeInterval = 0.1
|
||||
static let blinkCount: Int = 6
|
||||
static let invincibilityDuration: TimeInterval = 1.5
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
# FamilyAlbums - Apache Configuration
|
||||
|
||||
# Security Headers
|
||||
<IfModule mod_headers.c>
|
||||
Header set X-Content-Type-Options "nosniff"
|
||||
Header set X-Frame-Options "SAMEORIGIN"
|
||||
Header set X-XSS-Protection "1; mode=block"
|
||||
Header set Referrer-Policy "strict-origin-when-cross-origin"
|
||||
</IfModule>
|
||||
|
||||
# Deny access to config file
|
||||
<Files "config.php">
|
||||
<IfModule mod_authz_core.c>
|
||||
Require all denied
|
||||
</IfModule>
|
||||
<IfModule !mod_authz_core.c>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
</IfModule>
|
||||
</Files>
|
||||
|
||||
# Deny access to hidden files
|
||||
<FilesMatch "^\.">
|
||||
<IfModule mod_authz_core.c>
|
||||
Require all denied
|
||||
</IfModule>
|
||||
<IfModule !mod_authz_core.c>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
</IfModule>
|
||||
</FilesMatch>
|
||||
|
||||
# Enable compression
|
||||
<IfModule mod_deflate.c>
|
||||
AddOutputFilterByType DEFLATE text/html text/plain text/css application/json application/javascript
|
||||
</IfModule>
|
||||
|
||||
# Cache static assets
|
||||
<IfModule mod_expires.c>
|
||||
ExpiresActive On
|
||||
ExpiresByType image/jpeg "access plus 1 month"
|
||||
ExpiresByType image/png "access plus 1 month"
|
||||
ExpiresByType image/gif "access plus 1 month"
|
||||
ExpiresByType image/webp "access plus 1 month"
|
||||
</IfModule>
|
||||
|
||||
# Default charset
|
||||
AddDefaultCharset UTF-8
|
||||
@@ -0,0 +1,131 @@
|
||||
# FamilyAlbums - Familien-Fotoalbum-Portal
|
||||
|
||||
Ein einfaches, PHP-basiertes Portal zur Verwaltung und Anzeige von Familien-Fotoalben mit Links zu Nextcloud.
|
||||
|
||||
## Features
|
||||
|
||||
- Öffentliche Galerie-Ansicht mit Jahr/Monat-Filter
|
||||
- Stichwortsuche über Titel, Tags und Beschreibung
|
||||
- Kommentarfunktion für Familienmitglieder
|
||||
- Admin-Interface zur Albumverwaltung
|
||||
- Responsive Design (Tailwind CSS)
|
||||
- Flat-File Datenbank (JSON) - kein MySQL erforderlich
|
||||
- Spam-Schutz (Honeypot + Rate-Limiting)
|
||||
- CSRF-Schutz für Admin-Aktionen
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. Dateien kopieren
|
||||
|
||||
```bash
|
||||
# Auf den Webserver kopieren
|
||||
sudo cp -r familyalbums /var/www/
|
||||
|
||||
# Berechtigungen setzen
|
||||
sudo chown -R www-data:www-data /var/www/familyalbums
|
||||
sudo chmod -R 755 /var/www/familyalbums
|
||||
sudo chmod 770 /var/www/familyalbums/data
|
||||
sudo chmod 770 /var/www/familyalbums/thumbnails
|
||||
```
|
||||
|
||||
### 2. Admin-Passwort ändern
|
||||
|
||||
**WICHTIG:** Das Standard-Passwort muss vor dem produktiven Einsatz geändert werden!
|
||||
|
||||
```bash
|
||||
# Neuen Passwort-Hash generieren
|
||||
php -r "echo password_hash('DeinSicheresPasswort', PASSWORD_DEFAULT);"
|
||||
```
|
||||
|
||||
Den generierten Hash in `config.php` eintragen:
|
||||
|
||||
```php
|
||||
define('ADMIN_PASSWORD_HASH', '$2y$10$DEIN_GENERIERTER_HASH_HIER');
|
||||
```
|
||||
|
||||
### 3. Apache Virtual Host (optional)
|
||||
|
||||
```apache
|
||||
<VirtualHost *:80>
|
||||
ServerName familyalbums.example.com
|
||||
DocumentRoot /var/www/familyalbums
|
||||
|
||||
<Directory /var/www/familyalbums>
|
||||
AllowOverride All
|
||||
Require all granted
|
||||
</Directory>
|
||||
</VirtualHost>
|
||||
```
|
||||
|
||||
## Verwendung
|
||||
|
||||
### Öffentliche Galerie
|
||||
|
||||
- URL: `https://deine-domain.ch/`
|
||||
- Filter nach Jahr und Monat
|
||||
- Stichwortsuche
|
||||
- Kommentare zu Alben hinterlassen
|
||||
|
||||
### Admin-Bereich
|
||||
|
||||
- URL: `https://deine-domain.ch/admin.php`
|
||||
- Login mit dem konfigurierten Passwort
|
||||
- Alben hinzufügen, bearbeiten, löschen
|
||||
- Optional: Vorschaubilder hochladen
|
||||
- Kommentare moderieren
|
||||
|
||||
## Datenstruktur
|
||||
|
||||
### albums.json
|
||||
|
||||
```json
|
||||
{
|
||||
"albums": [
|
||||
{
|
||||
"id": "uuid",
|
||||
"title": "Albumtitel",
|
||||
"url": "https://nextcloud.../apps/photos/public/...",
|
||||
"date": "2024-12-25",
|
||||
"tags": ["tag1", "tag2"],
|
||||
"description": "Beschreibung",
|
||||
"thumbnail": "thumbnails/bild.jpg",
|
||||
"created_at": "2024-12-26T10:00:00+01:00"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
### comments.json
|
||||
|
||||
```json
|
||||
{
|
||||
"comments": [
|
||||
{
|
||||
"id": "uuid",
|
||||
"album_id": "album-uuid",
|
||||
"author": "Name",
|
||||
"text": "Kommentar",
|
||||
"created_at": "2024-12-27T14:30:00+01:00"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
## Sicherheit
|
||||
|
||||
- Admin-Passwort mit bcrypt gehasht
|
||||
- CSRF-Token für alle Admin-Aktionen
|
||||
- XSS-Schutz durch `htmlspecialchars()`
|
||||
- Rate-Limiting für Kommentare (5/Minute pro IP)
|
||||
- Honeypot-Feld gegen Spam-Bots
|
||||
- `.htaccess` schützt config.php und data/
|
||||
|
||||
## Anforderungen
|
||||
|
||||
- PHP 8.0+
|
||||
- Apache mit mod_rewrite (optional)
|
||||
- Schreibrechte für data/ und thumbnails/
|
||||
|
||||
## Lizenz
|
||||
|
||||
Privates Projekt für Familien-Nutzung.
|
||||
@@ -0,0 +1,658 @@
|
||||
<?php
|
||||
/**
|
||||
* FamilyAlbums - Admin Interface
|
||||
*/
|
||||
|
||||
require_once __DIR__ . '/config.php';
|
||||
session_start();
|
||||
|
||||
$pageTitle = SITE_TITLE . ' - Administration';
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title><?= e($pageTitle) ?></title>
|
||||
<script src="https://cdn.tailwindcss.com"></script>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
|
||||
<style>
|
||||
.tag-input { display: flex; flex-wrap: wrap; gap: 0.5rem; padding: 0.5rem; border: 1px solid #d1d5db; border-radius: 0.5rem; }
|
||||
.tag-item { background: #dbeafe; color: #1d4ed8; padding: 0.25rem 0.5rem; border-radius: 9999px; display: flex; align-items: center; gap: 0.25rem; }
|
||||
.tag-item button { color: #1d4ed8; cursor: pointer; }
|
||||
.tag-input input { flex: 1; min-width: 100px; border: none; outline: none; }
|
||||
.suggestions { position: absolute; top: 100%; left: 0; right: 0; background: white; border: 1px solid #d1d5db; border-radius: 0.5rem; max-height: 200px; overflow-y: auto; z-index: 10; }
|
||||
.suggestions div { padding: 0.5rem 1rem; cursor: pointer; }
|
||||
.suggestions div:hover { background: #f3f4f6; }
|
||||
</style>
|
||||
</head>
|
||||
<body class="bg-gray-100 min-h-screen">
|
||||
<!-- Login-Bereich (wird per JS gesteuert) -->
|
||||
<div id="login-section" class="hidden min-h-screen flex items-center justify-center">
|
||||
<div class="bg-white p-8 rounded-xl shadow-lg w-full max-w-md">
|
||||
<h1 class="text-2xl font-bold text-center mb-6">
|
||||
<i class="fas fa-lock mr-2 text-blue-600"></i>Admin Login
|
||||
</h1>
|
||||
<form id="login-form">
|
||||
<div class="mb-4">
|
||||
<label class="block text-gray-700 mb-2">Passwort</label>
|
||||
<input type="password" id="login-password" required
|
||||
class="w-full px-4 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500"
|
||||
placeholder="Admin-Passwort eingeben">
|
||||
</div>
|
||||
<div id="login-error" class="hidden text-red-500 text-sm mb-4"></div>
|
||||
<button type="submit" class="w-full bg-blue-600 text-white py-2 rounded-lg hover:bg-blue-700 transition">
|
||||
<i class="fas fa-sign-in-alt mr-2"></i>Anmelden
|
||||
</button>
|
||||
</form>
|
||||
<p class="mt-4 text-center">
|
||||
<a href="index.php" class="text-blue-600 hover:underline">
|
||||
<i class="fas fa-arrow-left mr-1"></i>Zurück zur Galerie
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Admin-Bereich -->
|
||||
<div id="admin-section" class="hidden">
|
||||
<!-- Header -->
|
||||
<header class="bg-gradient-to-r from-gray-800 to-gray-900 text-white shadow-lg">
|
||||
<div class="container mx-auto px-4 py-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<h1 class="text-xl font-bold">
|
||||
<i class="fas fa-cog mr-2"></i><?= e($pageTitle) ?>
|
||||
</h1>
|
||||
<div class="flex items-center gap-4">
|
||||
<a href="index.php" class="text-white/80 hover:text-white">
|
||||
<i class="fas fa-eye mr-1"></i>Galerie
|
||||
</a>
|
||||
<button onclick="logout()" class="text-white/80 hover:text-white">
|
||||
<i class="fas fa-sign-out-alt mr-1"></i>Logout
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<!-- Tabs -->
|
||||
<div class="bg-white shadow">
|
||||
<div class="container mx-auto px-4">
|
||||
<nav class="flex gap-4">
|
||||
<button onclick="showTab('albums')" id="tab-albums"
|
||||
class="tab-btn py-4 px-2 border-b-2 border-blue-600 text-blue-600 font-medium">
|
||||
<i class="fas fa-images mr-1"></i>Alben
|
||||
</button>
|
||||
<button onclick="showTab('comments')" id="tab-comments"
|
||||
class="tab-btn py-4 px-2 border-b-2 border-transparent text-gray-500 hover:text-gray-700">
|
||||
<i class="fas fa-comments mr-1"></i>Kommentare
|
||||
</button>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Content -->
|
||||
<main class="container mx-auto px-4 py-8">
|
||||
<!-- Alben-Tab -->
|
||||
<div id="content-albums">
|
||||
<!-- Album hinzufügen -->
|
||||
<div class="bg-white rounded-xl shadow-md p-6 mb-8">
|
||||
<h2 class="text-xl font-semibold mb-4">
|
||||
<i class="fas fa-plus-circle mr-2 text-green-600"></i>
|
||||
<span id="form-title">Neues Album hinzufügen</span>
|
||||
</h2>
|
||||
<form id="album-form" class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<input type="hidden" id="album-id">
|
||||
|
||||
<div>
|
||||
<label class="block text-gray-700 mb-1">Titel *</label>
|
||||
<input type="text" id="album-title" required
|
||||
class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500"
|
||||
placeholder="z.B. Weihnachten bei Oma">
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-gray-700 mb-1">Datum *</label>
|
||||
<input type="date" id="album-date" required
|
||||
class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500">
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-2">
|
||||
<label class="block text-gray-700 mb-1">Nextcloud-Link *</label>
|
||||
<input type="url" id="album-url" required
|
||||
class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500"
|
||||
placeholder="https://nextcloud.example.com/apps/photos/public/...">
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-2">
|
||||
<label class="block text-gray-700 mb-1">Beschreibung</label>
|
||||
<textarea id="album-description" rows="2"
|
||||
class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500"
|
||||
placeholder="Kurze Beschreibung des Albums"></textarea>
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-2 relative">
|
||||
<label class="block text-gray-700 mb-1">Tags</label>
|
||||
<div class="tag-input" id="tags-container">
|
||||
<input type="text" id="tag-input" placeholder="Tag eingeben und Enter drücken">
|
||||
</div>
|
||||
<div id="tag-suggestions" class="suggestions hidden"></div>
|
||||
<input type="hidden" id="album-tags">
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-2">
|
||||
<label class="block text-gray-700 mb-1">Vorschaubild (optional)</label>
|
||||
<div class="flex gap-2">
|
||||
<input type="file" id="thumbnail-file" accept="image/*"
|
||||
class="flex-1 px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500">
|
||||
<button type="button" onclick="uploadThumbnail()" class="px-4 py-2 bg-gray-200 rounded-lg hover:bg-gray-300">
|
||||
<i class="fas fa-upload"></i>
|
||||
</button>
|
||||
</div>
|
||||
<input type="hidden" id="album-thumbnail">
|
||||
<div id="thumbnail-preview" class="mt-2"></div>
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-2 flex gap-2">
|
||||
<button type="submit" class="bg-green-600 text-white px-6 py-2 rounded-lg hover:bg-green-700 transition">
|
||||
<i class="fas fa-save mr-2"></i><span id="submit-text">Speichern</span>
|
||||
</button>
|
||||
<button type="button" onclick="resetForm()" class="bg-gray-200 px-6 py-2 rounded-lg hover:bg-gray-300 transition">
|
||||
<i class="fas fa-times mr-2"></i>Abbrechen
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Album-Liste -->
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<h2 class="text-xl font-semibold mb-4">
|
||||
<i class="fas fa-list mr-2 text-blue-600"></i>Alle Alben
|
||||
</h2>
|
||||
<div id="albums-list" class="overflow-x-auto">
|
||||
<table class="w-full">
|
||||
<thead class="bg-gray-50">
|
||||
<tr>
|
||||
<th class="px-4 py-3 text-left text-gray-600">Titel</th>
|
||||
<th class="px-4 py-3 text-left text-gray-600">Datum</th>
|
||||
<th class="px-4 py-3 text-left text-gray-600">Tags</th>
|
||||
<th class="px-4 py-3 text-right text-gray-600">Aktionen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="albums-table-body">
|
||||
<!-- Wird per JS befüllt -->
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Kommentare-Tab -->
|
||||
<div id="content-comments" class="hidden">
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<h2 class="text-xl font-semibold mb-4">
|
||||
<i class="fas fa-comments mr-2 text-blue-600"></i>Alle Kommentare
|
||||
</h2>
|
||||
<div id="comments-list" class="space-y-4">
|
||||
<!-- Wird per JS befüllt -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<!-- Bestätigungs-Modal -->
|
||||
<div id="confirm-modal" class="hidden fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
|
||||
<div class="bg-white rounded-xl shadow-2xl max-w-md w-full p-6">
|
||||
<h3 class="text-lg font-semibold mb-4" id="confirm-title">Bestätigung</h3>
|
||||
<p id="confirm-message" class="text-gray-600 mb-6"></p>
|
||||
<div class="flex justify-end gap-2">
|
||||
<button onclick="closeConfirm()" class="px-4 py-2 bg-gray-200 rounded-lg hover:bg-gray-300">
|
||||
Abbrechen
|
||||
</button>
|
||||
<button id="confirm-btn" class="px-4 py-2 bg-red-600 text-white rounded-lg hover:bg-red-700">
|
||||
Löschen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// === State ===
|
||||
let csrfToken = '';
|
||||
let allTags = [];
|
||||
let currentTags = [];
|
||||
let editingAlbumId = null;
|
||||
let confirmCallback = null;
|
||||
|
||||
// === Auth ===
|
||||
async function checkAuth() {
|
||||
const response = await fetch('api.php?action=check_auth');
|
||||
const data = await response.json();
|
||||
|
||||
if (data.authenticated) {
|
||||
csrfToken = data.csrf;
|
||||
document.getElementById('login-section').classList.add('hidden');
|
||||
document.getElementById('admin-section').classList.remove('hidden');
|
||||
loadAlbums();
|
||||
loadAllTags();
|
||||
} else {
|
||||
document.getElementById('login-section').classList.remove('hidden');
|
||||
document.getElementById('admin-section').classList.add('hidden');
|
||||
}
|
||||
}
|
||||
|
||||
document.getElementById('login-form').addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
const password = document.getElementById('login-password').value;
|
||||
const errorDiv = document.getElementById('login-error');
|
||||
|
||||
try {
|
||||
const response = await fetch('api.php?action=login', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ password })
|
||||
});
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success) {
|
||||
csrfToken = data.csrf;
|
||||
document.getElementById('login-section').classList.add('hidden');
|
||||
document.getElementById('admin-section').classList.remove('hidden');
|
||||
loadAlbums();
|
||||
loadAllTags();
|
||||
} else {
|
||||
errorDiv.textContent = data.error || 'Login fehlgeschlagen';
|
||||
errorDiv.classList.remove('hidden');
|
||||
}
|
||||
} catch (err) {
|
||||
errorDiv.textContent = 'Verbindungsfehler';
|
||||
errorDiv.classList.remove('hidden');
|
||||
}
|
||||
});
|
||||
|
||||
async function logout() {
|
||||
await fetch('api.php?action=logout', { method: 'POST' });
|
||||
location.reload();
|
||||
}
|
||||
|
||||
// === Tabs ===
|
||||
function showTab(tab) {
|
||||
document.querySelectorAll('.tab-btn').forEach(btn => {
|
||||
btn.classList.remove('border-blue-600', 'text-blue-600');
|
||||
btn.classList.add('border-transparent', 'text-gray-500');
|
||||
});
|
||||
document.getElementById(`tab-${tab}`).classList.add('border-blue-600', 'text-blue-600');
|
||||
document.getElementById(`tab-${tab}`).classList.remove('border-transparent', 'text-gray-500');
|
||||
|
||||
document.getElementById('content-albums').classList.add('hidden');
|
||||
document.getElementById('content-comments').classList.add('hidden');
|
||||
document.getElementById(`content-${tab}`).classList.remove('hidden');
|
||||
|
||||
if (tab === 'comments') {
|
||||
loadAllComments();
|
||||
}
|
||||
}
|
||||
|
||||
// === Albums ===
|
||||
async function loadAlbums() {
|
||||
const response = await fetch('api.php?action=albums');
|
||||
const data = await response.json();
|
||||
renderAlbumsTable(data.albums || []);
|
||||
}
|
||||
|
||||
function renderAlbumsTable(albums) {
|
||||
const tbody = document.getElementById('albums-table-body');
|
||||
|
||||
if (albums.length === 0) {
|
||||
tbody.innerHTML = '<tr><td colspan="4" class="text-center py-8 text-gray-500">Noch keine Alben vorhanden</td></tr>';
|
||||
return;
|
||||
}
|
||||
|
||||
tbody.innerHTML = albums.map(album => `
|
||||
<tr class="border-t hover:bg-gray-50">
|
||||
<td class="px-4 py-3">
|
||||
<div class="font-medium">${escapeHtml(album.title)}</div>
|
||||
<div class="text-sm text-gray-500 truncate max-w-xs">${escapeHtml(album.url)}</div>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-gray-600">${album.date}</td>
|
||||
<td class="px-4 py-3">
|
||||
<div class="flex flex-wrap gap-1">
|
||||
${album.tags.slice(0, 3).map(tag =>
|
||||
`<span class="bg-blue-100 text-blue-700 text-xs px-2 py-0.5 rounded-full">${escapeHtml(tag)}</span>`
|
||||
).join('')}
|
||||
${album.tags.length > 3 ? `<span class="text-gray-400 text-xs">+${album.tags.length - 3}</span>` : ''}
|
||||
</div>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-right">
|
||||
<button onclick='editAlbum(${JSON.stringify(album).replace(/'/g, "'")})' class="text-blue-600 hover:text-blue-800 mr-2">
|
||||
<i class="fas fa-edit"></i>
|
||||
</button>
|
||||
<button onclick="confirmDelete('album', '${album.id}', '${escapeHtml(album.title)}')" class="text-red-600 hover:text-red-800">
|
||||
<i class="fas fa-trash"></i>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
async function loadAllTags() {
|
||||
const response = await fetch('api.php?action=tags');
|
||||
const data = await response.json();
|
||||
allTags = data.tags || [];
|
||||
}
|
||||
|
||||
// === Album Form ===
|
||||
document.getElementById('album-form').addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
const album = {
|
||||
csrf: csrfToken,
|
||||
title: document.getElementById('album-title').value,
|
||||
url: document.getElementById('album-url').value,
|
||||
date: document.getElementById('album-date').value,
|
||||
description: document.getElementById('album-description').value,
|
||||
tags: currentTags,
|
||||
thumbnail: document.getElementById('album-thumbnail').value
|
||||
};
|
||||
|
||||
let url = 'api.php?action=album';
|
||||
let method = 'POST';
|
||||
|
||||
if (editingAlbumId) {
|
||||
album.id = editingAlbumId;
|
||||
method = 'PUT';
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(url, {
|
||||
method: method,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(album)
|
||||
});
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success) {
|
||||
resetForm();
|
||||
loadAlbums();
|
||||
loadAllTags();
|
||||
} else {
|
||||
alert(data.error || 'Fehler beim Speichern');
|
||||
}
|
||||
} catch (err) {
|
||||
alert('Verbindungsfehler');
|
||||
}
|
||||
});
|
||||
|
||||
function editAlbum(album) {
|
||||
editingAlbumId = album.id;
|
||||
document.getElementById('album-id').value = album.id;
|
||||
document.getElementById('album-title').value = album.title;
|
||||
document.getElementById('album-url').value = album.url;
|
||||
document.getElementById('album-date').value = album.date;
|
||||
document.getElementById('album-description').value = album.description || '';
|
||||
document.getElementById('album-thumbnail').value = album.thumbnail || '';
|
||||
|
||||
// Tags
|
||||
currentTags = [...album.tags];
|
||||
renderTags();
|
||||
|
||||
// Thumbnail preview
|
||||
if (album.thumbnail) {
|
||||
document.getElementById('thumbnail-preview').innerHTML =
|
||||
`<img src="${escapeHtml(album.thumbnail)}" class="h-20 rounded">`;
|
||||
}
|
||||
|
||||
document.getElementById('form-title').textContent = 'Album bearbeiten';
|
||||
document.getElementById('submit-text').textContent = 'Aktualisieren';
|
||||
|
||||
// Scroll to form
|
||||
document.getElementById('album-form').scrollIntoView({ behavior: 'smooth' });
|
||||
}
|
||||
|
||||
function resetForm() {
|
||||
editingAlbumId = null;
|
||||
document.getElementById('album-form').reset();
|
||||
document.getElementById('album-thumbnail').value = '';
|
||||
document.getElementById('thumbnail-preview').innerHTML = '';
|
||||
currentTags = [];
|
||||
renderTags();
|
||||
document.getElementById('form-title').textContent = 'Neues Album hinzufügen';
|
||||
document.getElementById('submit-text').textContent = 'Speichern';
|
||||
}
|
||||
|
||||
async function deleteAlbum(id) {
|
||||
try {
|
||||
const response = await fetch('api.php?action=album', {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ id, csrf: csrfToken })
|
||||
});
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success) {
|
||||
loadAlbums();
|
||||
} else {
|
||||
alert(data.error || 'Fehler beim Löschen');
|
||||
}
|
||||
} catch (err) {
|
||||
alert('Verbindungsfehler');
|
||||
}
|
||||
}
|
||||
|
||||
// === Tags ===
|
||||
function renderTags() {
|
||||
const container = document.getElementById('tags-container');
|
||||
const input = document.getElementById('tag-input');
|
||||
|
||||
// Remove existing tag items
|
||||
container.querySelectorAll('.tag-item').forEach(el => el.remove());
|
||||
|
||||
// Add tag items before input
|
||||
currentTags.forEach((tag, index) => {
|
||||
const span = document.createElement('span');
|
||||
span.className = 'tag-item';
|
||||
span.innerHTML = `${escapeHtml(tag)}<button type="button" onclick="removeTag(${index})">×</button>`;
|
||||
container.insertBefore(span, input);
|
||||
});
|
||||
}
|
||||
|
||||
function removeTag(index) {
|
||||
currentTags.splice(index, 1);
|
||||
renderTags();
|
||||
}
|
||||
|
||||
document.getElementById('tag-input').addEventListener('keydown', (e) => {
|
||||
if (e.key === 'Enter' || e.key === ',') {
|
||||
e.preventDefault();
|
||||
const value = e.target.value.trim();
|
||||
if (value && !currentTags.includes(value)) {
|
||||
currentTags.push(value);
|
||||
renderTags();
|
||||
}
|
||||
e.target.value = '';
|
||||
document.getElementById('tag-suggestions').classList.add('hidden');
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById('tag-input').addEventListener('input', (e) => {
|
||||
const value = e.target.value.toLowerCase();
|
||||
const suggestions = document.getElementById('tag-suggestions');
|
||||
|
||||
if (value.length < 1) {
|
||||
suggestions.classList.add('hidden');
|
||||
return;
|
||||
}
|
||||
|
||||
const matches = allTags.filter(tag =>
|
||||
tag.toLowerCase().includes(value) && !currentTags.includes(tag)
|
||||
).slice(0, 5);
|
||||
|
||||
if (matches.length === 0) {
|
||||
suggestions.classList.add('hidden');
|
||||
return;
|
||||
}
|
||||
|
||||
suggestions.innerHTML = matches.map(tag =>
|
||||
`<div onclick="selectTag('${escapeHtml(tag)}')">${escapeHtml(tag)}</div>`
|
||||
).join('');
|
||||
suggestions.classList.remove('hidden');
|
||||
});
|
||||
|
||||
function selectTag(tag) {
|
||||
if (!currentTags.includes(tag)) {
|
||||
currentTags.push(tag);
|
||||
renderTags();
|
||||
}
|
||||
document.getElementById('tag-input').value = '';
|
||||
document.getElementById('tag-suggestions').classList.add('hidden');
|
||||
}
|
||||
|
||||
// === Thumbnail Upload ===
|
||||
async function uploadThumbnail() {
|
||||
const fileInput = document.getElementById('thumbnail-file');
|
||||
if (!fileInput.files[0]) {
|
||||
alert('Bitte wähle zuerst ein Bild aus');
|
||||
return;
|
||||
}
|
||||
|
||||
const formData = new FormData();
|
||||
formData.append('thumbnail', fileInput.files[0]);
|
||||
formData.append('csrf', csrfToken);
|
||||
|
||||
try {
|
||||
const response = await fetch('api.php?action=upload_thumbnail', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
});
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success) {
|
||||
document.getElementById('album-thumbnail').value = data.path;
|
||||
document.getElementById('thumbnail-preview').innerHTML =
|
||||
`<img src="${escapeHtml(data.path)}" class="h-20 rounded">`;
|
||||
fileInput.value = '';
|
||||
} else {
|
||||
alert(data.error || 'Upload fehlgeschlagen');
|
||||
}
|
||||
} catch (err) {
|
||||
alert('Verbindungsfehler');
|
||||
}
|
||||
}
|
||||
|
||||
// === Comments ===
|
||||
async function loadAllComments() {
|
||||
const albumsResponse = await fetch('api.php?action=albums');
|
||||
const albumsData = await albumsResponse.json();
|
||||
const albums = albumsData.albums || [];
|
||||
|
||||
const commentsContainer = document.getElementById('comments-list');
|
||||
commentsContainer.innerHTML = '<p class="text-center"><i class="fas fa-spinner fa-spin"></i> Lade Kommentare...</p>';
|
||||
|
||||
// Kommentare für alle Alben laden
|
||||
const allComments = [];
|
||||
for (const album of albums) {
|
||||
const response = await fetch(`api.php?action=comments&album_id=${album.id}`);
|
||||
const data = await response.json();
|
||||
(data.comments || []).forEach(comment => {
|
||||
comment.albumTitle = album.title;
|
||||
allComments.push(comment);
|
||||
});
|
||||
}
|
||||
|
||||
// Nach Datum sortieren
|
||||
allComments.sort((a, b) => b.created_at.localeCompare(a.created_at));
|
||||
|
||||
if (allComments.length === 0) {
|
||||
commentsContainer.innerHTML = '<p class="text-center text-gray-500 py-8">Noch keine Kommentare vorhanden</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
commentsContainer.innerHTML = allComments.map(comment => `
|
||||
<div class="bg-gray-50 p-4 rounded-lg">
|
||||
<div class="flex justify-between items-start mb-2">
|
||||
<div>
|
||||
<span class="font-semibold">${escapeHtml(comment.author)}</span>
|
||||
<span class="text-gray-400 text-sm ml-2">${formatDateTime(comment.created_at)}</span>
|
||||
</div>
|
||||
<button onclick="confirmDelete('comment', '${comment.id}', 'diesen Kommentar')" class="text-red-600 hover:text-red-800">
|
||||
<i class="fas fa-trash"></i>
|
||||
</button>
|
||||
</div>
|
||||
<p class="text-gray-700 mb-2">${escapeHtml(comment.text)}</p>
|
||||
<p class="text-sm text-gray-500">
|
||||
<i class="fas fa-images mr-1"></i>${escapeHtml(comment.albumTitle)}
|
||||
</p>
|
||||
</div>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
async function deleteComment(id) {
|
||||
try {
|
||||
const response = await fetch('api.php?action=comment', {
|
||||
method: 'DELETE',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ id, csrf: csrfToken })
|
||||
});
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success) {
|
||||
loadAllComments();
|
||||
} else {
|
||||
alert(data.error || 'Fehler beim Löschen');
|
||||
}
|
||||
} catch (err) {
|
||||
alert('Verbindungsfehler');
|
||||
}
|
||||
}
|
||||
|
||||
// === Confirm Modal ===
|
||||
function confirmDelete(type, id, name) {
|
||||
document.getElementById('confirm-message').textContent =
|
||||
`Möchtest du "${name}" wirklich löschen?`;
|
||||
|
||||
confirmCallback = () => {
|
||||
if (type === 'album') {
|
||||
deleteAlbum(id);
|
||||
} else if (type === 'comment') {
|
||||
deleteComment(id);
|
||||
}
|
||||
};
|
||||
|
||||
document.getElementById('confirm-modal').classList.remove('hidden');
|
||||
}
|
||||
|
||||
function closeConfirm() {
|
||||
document.getElementById('confirm-modal').classList.add('hidden');
|
||||
confirmCallback = null;
|
||||
}
|
||||
|
||||
document.getElementById('confirm-btn').addEventListener('click', () => {
|
||||
if (confirmCallback) {
|
||||
confirmCallback();
|
||||
}
|
||||
closeConfirm();
|
||||
});
|
||||
|
||||
// === Helpers ===
|
||||
function escapeHtml(text) {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = text;
|
||||
return div.innerHTML;
|
||||
}
|
||||
|
||||
function formatDateTime(isoStr) {
|
||||
const date = new Date(isoStr);
|
||||
return date.toLocaleDateString('de-CH', {
|
||||
day: 'numeric',
|
||||
month: 'long',
|
||||
year: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
}
|
||||
|
||||
// === Init ===
|
||||
checkAuth();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,350 @@
|
||||
<?php
|
||||
/**
|
||||
* FamilyAlbums - API Endpunkte
|
||||
*/
|
||||
|
||||
require_once __DIR__ . '/config.php';
|
||||
|
||||
session_start();
|
||||
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
|
||||
$method = $_SERVER['REQUEST_METHOD'];
|
||||
$action = $_GET['action'] ?? '';
|
||||
|
||||
// Hilfsfunktion: JSON Response
|
||||
function json_response(array $data, int $code = 200): void {
|
||||
http_response_code($code);
|
||||
echo json_encode($data, JSON_UNESCAPED_UNICODE);
|
||||
exit;
|
||||
}
|
||||
|
||||
// Hilfsfunktion: Admin-Check
|
||||
function require_admin(): void {
|
||||
if (empty($_SESSION['admin_logged_in'])) {
|
||||
json_response(['error' => 'Nicht autorisiert'], 401);
|
||||
}
|
||||
}
|
||||
|
||||
// === ALBEN ===
|
||||
|
||||
if ($action === 'albums' && $method === 'GET') {
|
||||
// Alle Alben abrufen (öffentlich)
|
||||
$data = read_json(ALBUMS_FILE);
|
||||
$albums = $data['albums'] ?? [];
|
||||
|
||||
// Filter: Jahr
|
||||
if (!empty($_GET['year'])) {
|
||||
$year = $_GET['year'];
|
||||
$albums = array_filter($albums, fn($a) => substr($a['date'], 0, 4) === $year);
|
||||
}
|
||||
|
||||
// Filter: Monat
|
||||
if (!empty($_GET['month'])) {
|
||||
$month = $_GET['month'];
|
||||
$albums = array_filter($albums, fn($a) => substr($a['date'], 5, 2) === $month);
|
||||
}
|
||||
|
||||
// Filter: Suche
|
||||
if (!empty($_GET['search'])) {
|
||||
$search = mb_strtolower($_GET['search']);
|
||||
$albums = array_filter($albums, function($a) use ($search) {
|
||||
$haystack = mb_strtolower($a['title'] . ' ' . $a['description'] . ' ' . implode(' ', $a['tags']));
|
||||
return str_contains($haystack, $search);
|
||||
});
|
||||
}
|
||||
|
||||
// Sortierung
|
||||
$sort = $_GET['sort'] ?? 'newest';
|
||||
usort($albums, function($a, $b) use ($sort) {
|
||||
if ($sort === 'oldest') {
|
||||
return strcmp($a['date'], $b['date']);
|
||||
}
|
||||
return strcmp($b['date'], $a['date']); // newest first
|
||||
});
|
||||
|
||||
json_response(['albums' => array_values($albums)]);
|
||||
}
|
||||
|
||||
if ($action === 'album' && $method === 'POST') {
|
||||
// Album erstellen (Admin)
|
||||
require_admin();
|
||||
|
||||
$input = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
if (!csrf_validate($input['csrf'] ?? '')) {
|
||||
json_response(['error' => 'Ungültiges CSRF-Token'], 403);
|
||||
}
|
||||
|
||||
if (empty($input['title']) || empty($input['url']) || empty($input['date'])) {
|
||||
json_response(['error' => 'Titel, URL und Datum sind Pflichtfelder'], 400);
|
||||
}
|
||||
|
||||
$album = [
|
||||
'id' => generate_uuid(),
|
||||
'title' => trim($input['title']),
|
||||
'url' => trim($input['url']),
|
||||
'date' => $input['date'],
|
||||
'tags' => array_map('trim', $input['tags'] ?? []),
|
||||
'description' => trim($input['description'] ?? ''),
|
||||
'thumbnail' => $input['thumbnail'] ?? '',
|
||||
'created_at' => date('c')
|
||||
];
|
||||
|
||||
$data = read_json(ALBUMS_FILE);
|
||||
$data['albums'][] = $album;
|
||||
write_json(ALBUMS_FILE, $data);
|
||||
|
||||
json_response(['success' => true, 'album' => $album]);
|
||||
}
|
||||
|
||||
if ($action === 'album' && $method === 'PUT') {
|
||||
// Album bearbeiten (Admin)
|
||||
require_admin();
|
||||
|
||||
$input = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
if (!csrf_validate($input['csrf'] ?? '')) {
|
||||
json_response(['error' => 'Ungültiges CSRF-Token'], 403);
|
||||
}
|
||||
|
||||
$id = $input['id'] ?? '';
|
||||
|
||||
$data = read_json(ALBUMS_FILE);
|
||||
$found = false;
|
||||
|
||||
foreach ($data['albums'] as &$album) {
|
||||
if ($album['id'] === $id) {
|
||||
$album['title'] = trim($input['title'] ?? $album['title']);
|
||||
$album['url'] = trim($input['url'] ?? $album['url']);
|
||||
$album['date'] = $input['date'] ?? $album['date'];
|
||||
$album['tags'] = array_map('trim', $input['tags'] ?? $album['tags']);
|
||||
$album['description'] = trim($input['description'] ?? $album['description']);
|
||||
$album['thumbnail'] = $input['thumbnail'] ?? $album['thumbnail'];
|
||||
$found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$found) {
|
||||
json_response(['error' => 'Album nicht gefunden'], 404);
|
||||
}
|
||||
|
||||
write_json(ALBUMS_FILE, $data);
|
||||
json_response(['success' => true]);
|
||||
}
|
||||
|
||||
if ($action === 'album' && $method === 'DELETE') {
|
||||
// Album löschen (Admin)
|
||||
require_admin();
|
||||
|
||||
$input = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
if (!csrf_validate($input['csrf'] ?? '')) {
|
||||
json_response(['error' => 'Ungültiges CSRF-Token'], 403);
|
||||
}
|
||||
|
||||
$id = $input['id'] ?? '';
|
||||
|
||||
$data = read_json(ALBUMS_FILE);
|
||||
$data['albums'] = array_filter($data['albums'], fn($a) => $a['id'] !== $id);
|
||||
$data['albums'] = array_values($data['albums']);
|
||||
write_json(ALBUMS_FILE, $data);
|
||||
|
||||
// Zugehörige Kommentare löschen
|
||||
$comments = read_json(COMMENTS_FILE);
|
||||
$comments['comments'] = array_filter($comments['comments'], fn($c) => $c['album_id'] !== $id);
|
||||
$comments['comments'] = array_values($comments['comments']);
|
||||
write_json(COMMENTS_FILE, $comments);
|
||||
|
||||
json_response(['success' => true]);
|
||||
}
|
||||
|
||||
// === KOMMENTARE ===
|
||||
|
||||
if ($action === 'comments' && $method === 'GET') {
|
||||
// Kommentare für Album abrufen (öffentlich)
|
||||
$album_id = $_GET['album_id'] ?? '';
|
||||
|
||||
$data = read_json(COMMENTS_FILE);
|
||||
$comments = array_filter($data['comments'] ?? [], fn($c) => $c['album_id'] === $album_id);
|
||||
|
||||
// Nach Datum sortieren (neueste zuerst)
|
||||
usort($comments, fn($a, $b) => strcmp($b['created_at'], $a['created_at']));
|
||||
|
||||
json_response(['comments' => array_values($comments)]);
|
||||
}
|
||||
|
||||
if ($action === 'comment' && $method === 'POST') {
|
||||
// Kommentar erstellen (öffentlich)
|
||||
$input = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
if (empty($input['album_id']) || empty($input['author']) || empty($input['text'])) {
|
||||
json_response(['error' => 'Album-ID, Name und Text sind Pflichtfelder'], 400);
|
||||
}
|
||||
|
||||
// Honeypot-Check (Spam-Schutz)
|
||||
if (!empty($input['website'])) {
|
||||
json_response(['success' => true]); // Fake-Erfolg für Bots
|
||||
}
|
||||
|
||||
// Rate-Limiting: Max 5 Kommentare pro Minute pro IP
|
||||
$ip = $_SERVER['REMOTE_ADDR'];
|
||||
$rate_file = DATA_PATH . 'rate_' . md5($ip) . '.json';
|
||||
$rate_data = read_json($rate_file);
|
||||
$now = time();
|
||||
$rate_data['times'] = array_filter($rate_data['times'] ?? [], fn($t) => $t > $now - 60);
|
||||
|
||||
if (count($rate_data['times']) >= 5) {
|
||||
json_response(['error' => 'Zu viele Kommentare. Bitte warte eine Minute.'], 429);
|
||||
}
|
||||
|
||||
$rate_data['times'][] = $now;
|
||||
write_json($rate_file, $rate_data);
|
||||
|
||||
$comment = [
|
||||
'id' => generate_uuid(),
|
||||
'album_id' => $input['album_id'],
|
||||
'author' => trim($input['author']),
|
||||
'text' => trim($input['text']),
|
||||
'created_at' => date('c')
|
||||
];
|
||||
|
||||
$data = read_json(COMMENTS_FILE);
|
||||
$data['comments'][] = $comment;
|
||||
write_json(COMMENTS_FILE, $data);
|
||||
|
||||
json_response(['success' => true, 'comment' => $comment]);
|
||||
}
|
||||
|
||||
if ($action === 'comment' && $method === 'DELETE') {
|
||||
// Kommentar löschen (Admin)
|
||||
require_admin();
|
||||
|
||||
$input = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
if (!csrf_validate($input['csrf'] ?? '')) {
|
||||
json_response(['error' => 'Ungültiges CSRF-Token'], 403);
|
||||
}
|
||||
|
||||
$id = $input['id'] ?? '';
|
||||
|
||||
$data = read_json(COMMENTS_FILE);
|
||||
$data['comments'] = array_filter($data['comments'], fn($c) => $c['id'] !== $id);
|
||||
$data['comments'] = array_values($data['comments']);
|
||||
write_json(COMMENTS_FILE, $data);
|
||||
|
||||
json_response(['success' => true]);
|
||||
}
|
||||
|
||||
// === TAGS ===
|
||||
|
||||
if ($action === 'tags' && $method === 'GET') {
|
||||
// Alle verwendeten Tags abrufen (für Vorschläge)
|
||||
$data = read_json(ALBUMS_FILE);
|
||||
$tags = [];
|
||||
|
||||
foreach ($data['albums'] ?? [] as $album) {
|
||||
foreach ($album['tags'] ?? [] as $tag) {
|
||||
$tags[$tag] = ($tags[$tag] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
arsort($tags);
|
||||
json_response(['tags' => array_keys($tags)]);
|
||||
}
|
||||
|
||||
// === JAHRE/MONATE ===
|
||||
|
||||
if ($action === 'dates' && $method === 'GET') {
|
||||
// Verfügbare Jahre und Monate
|
||||
$data = read_json(ALBUMS_FILE);
|
||||
$years = [];
|
||||
|
||||
foreach ($data['albums'] ?? [] as $album) {
|
||||
$year = substr($album['date'], 0, 4);
|
||||
$month = substr($album['date'], 5, 2);
|
||||
|
||||
if (!isset($years[$year])) {
|
||||
$years[$year] = [];
|
||||
}
|
||||
if (!in_array($month, $years[$year])) {
|
||||
$years[$year][] = $month;
|
||||
}
|
||||
}
|
||||
|
||||
// Sortieren
|
||||
krsort($years);
|
||||
foreach ($years as &$months) {
|
||||
sort($months);
|
||||
}
|
||||
|
||||
json_response(['dates' => $years]);
|
||||
}
|
||||
|
||||
// === AUTH ===
|
||||
|
||||
if ($action === 'login' && $method === 'POST') {
|
||||
$input = json_decode(file_get_contents('php://input'), true);
|
||||
$password = $input['password'] ?? '';
|
||||
|
||||
if (password_verify($password, ADMIN_PASSWORD_HASH)) {
|
||||
$_SESSION['admin_logged_in'] = true;
|
||||
$_SESSION['csrf_token'] = bin2hex(random_bytes(32));
|
||||
json_response(['success' => true, 'csrf' => $_SESSION['csrf_token']]);
|
||||
}
|
||||
|
||||
// Verzögerung gegen Brute-Force
|
||||
sleep(1);
|
||||
json_response(['error' => 'Falsches Passwort'], 401);
|
||||
}
|
||||
|
||||
if ($action === 'logout' && $method === 'POST') {
|
||||
session_destroy();
|
||||
json_response(['success' => true]);
|
||||
}
|
||||
|
||||
if ($action === 'check_auth' && $method === 'GET') {
|
||||
json_response([
|
||||
'authenticated' => !empty($_SESSION['admin_logged_in']),
|
||||
'csrf' => $_SESSION['csrf_token'] ?? ''
|
||||
]);
|
||||
}
|
||||
|
||||
// === THUMBNAIL UPLOAD ===
|
||||
|
||||
if ($action === 'upload_thumbnail' && $method === 'POST') {
|
||||
require_admin();
|
||||
|
||||
if (empty($_POST['csrf']) || !csrf_validate($_POST['csrf'])) {
|
||||
json_response(['error' => 'Ungültiges CSRF-Token'], 403);
|
||||
}
|
||||
|
||||
if (empty($_FILES['thumbnail']) || $_FILES['thumbnail']['error'] !== UPLOAD_ERR_OK) {
|
||||
json_response(['error' => 'Kein Bild hochgeladen'], 400);
|
||||
}
|
||||
|
||||
$file = $_FILES['thumbnail'];
|
||||
$allowed = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'];
|
||||
|
||||
if (!in_array($file['type'], $allowed)) {
|
||||
json_response(['error' => 'Nur JPG, PNG, GIF und WebP erlaubt'], 400);
|
||||
}
|
||||
|
||||
if ($file['size'] > 5 * 1024 * 1024) {
|
||||
json_response(['error' => 'Maximale Dateigrösse: 5MB'], 400);
|
||||
}
|
||||
|
||||
$ext = pathinfo($file['name'], PATHINFO_EXTENSION);
|
||||
$filename = generate_uuid() . '.' . $ext;
|
||||
$path = THUMBNAIL_PATH . $filename;
|
||||
|
||||
if (!move_uploaded_file($file['tmp_name'], $path)) {
|
||||
json_response(['error' => 'Upload fehlgeschlagen'], 500);
|
||||
}
|
||||
|
||||
json_response(['success' => true, 'path' => THUMBNAIL_URL . $filename]);
|
||||
}
|
||||
|
||||
// Unbekannte Aktion
|
||||
json_response(['error' => 'Unbekannte Aktion'], 404);
|
||||
@@ -0,0 +1,91 @@
|
||||
<?php
|
||||
/**
|
||||
* FamilyAlbums - Konfiguration
|
||||
*
|
||||
* WICHTIG: Nach erster Installation Passwort ändern!
|
||||
* Neuen Hash generieren: php -r "echo password_hash('deinPasswort', PASSWORD_DEFAULT);"
|
||||
*/
|
||||
|
||||
// Standard-Passwort: "familie2024" - BITTE ÄNDERN!
|
||||
define('ADMIN_PASSWORD_HASH', '$2y$10$YxQx8B7GkDqNmPrC4VzKH.qN4tQ8WvX5kF7mZ3hJ9aE1bC2dR6uYO');
|
||||
|
||||
define('SITE_TITLE', 'Familien-Fotoalben');
|
||||
define('DATA_PATH', __DIR__ . '/data/');
|
||||
define('THUMBNAIL_PATH', __DIR__ . '/thumbnails/');
|
||||
define('THUMBNAIL_URL', 'thumbnails/');
|
||||
|
||||
define('ALBUMS_FILE', DATA_PATH . 'albums.json');
|
||||
define('COMMENTS_FILE', DATA_PATH . 'comments.json');
|
||||
|
||||
// Session-Einstellungen
|
||||
define('SESSION_LIFETIME', 3600); // 1 Stunde
|
||||
|
||||
// Zeitzone
|
||||
date_default_timezone_set('Europe/Zurich');
|
||||
|
||||
/**
|
||||
* JSON-Datei lesen
|
||||
*/
|
||||
function read_json(string $file): array {
|
||||
if (!file_exists($file)) {
|
||||
return [];
|
||||
}
|
||||
$content = file_get_contents($file);
|
||||
return json_decode($content, true) ?? [];
|
||||
}
|
||||
|
||||
/**
|
||||
* JSON-Datei schreiben
|
||||
*/
|
||||
function write_json(string $file, array $data): bool {
|
||||
$dir = dirname($file);
|
||||
if (!is_dir($dir)) {
|
||||
mkdir($dir, 0770, true);
|
||||
}
|
||||
return file_put_contents($file, json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)) !== false;
|
||||
}
|
||||
|
||||
/**
|
||||
* UUID generieren
|
||||
*/
|
||||
function generate_uuid(): string {
|
||||
return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
|
||||
mt_rand(0, 0xffff), mt_rand(0, 0xffff),
|
||||
mt_rand(0, 0xffff),
|
||||
mt_rand(0, 0x0fff) | 0x4000,
|
||||
mt_rand(0, 0x3fff) | 0x8000,
|
||||
mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* XSS-sichere Ausgabe
|
||||
*/
|
||||
function e(string $str): string {
|
||||
return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
|
||||
}
|
||||
|
||||
/**
|
||||
* CSRF-Token generieren
|
||||
*/
|
||||
function csrf_token(): string {
|
||||
if (empty($_SESSION['csrf_token'])) {
|
||||
$_SESSION['csrf_token'] = bin2hex(random_bytes(32));
|
||||
}
|
||||
return $_SESSION['csrf_token'];
|
||||
}
|
||||
|
||||
/**
|
||||
* CSRF-Token validieren
|
||||
*/
|
||||
function csrf_validate(string $token): bool {
|
||||
return isset($_SESSION['csrf_token']) && hash_equals($_SESSION['csrf_token'], $token);
|
||||
}
|
||||
|
||||
// Initialisiere Daten-Dateien falls nicht vorhanden
|
||||
if (!file_exists(ALBUMS_FILE)) {
|
||||
write_json(ALBUMS_FILE, ['albums' => []]);
|
||||
}
|
||||
if (!file_exists(COMMENTS_FILE)) {
|
||||
write_json(COMMENTS_FILE, ['comments' => []]);
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
# Deny access to all files in this directory
|
||||
<IfModule mod_authz_core.c>
|
||||
Require all denied
|
||||
</IfModule>
|
||||
<IfModule !mod_authz_core.c>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
</IfModule>
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"albums": [
|
||||
{
|
||||
"id": "demo-001",
|
||||
"title": "Weihnachten 2024",
|
||||
"url": "https://nextcloud.example.com/apps/photos/public/demo",
|
||||
"date": "2024-12-25",
|
||||
"tags": ["weihnachten", "familie", "2024"],
|
||||
"description": "Bescherung und Festessen bei der Familie",
|
||||
"thumbnail": "",
|
||||
"created_at": "2024-12-26T10:00:00+01:00"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"comments": []
|
||||
}
|
||||
@@ -0,0 +1,449 @@
|
||||
<?php
|
||||
/**
|
||||
* FamilyAlbums - Öffentliche Ansicht
|
||||
*/
|
||||
|
||||
require_once __DIR__ . '/config.php';
|
||||
|
||||
$pageTitle = SITE_TITLE;
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title><?= e($pageTitle) ?></title>
|
||||
<script src="https://cdn.tailwindcss.com"></script>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
|
||||
<style>
|
||||
.album-card:hover { transform: translateY(-4px); }
|
||||
.tag { transition: all 0.2s; }
|
||||
.tag:hover { transform: scale(1.05); }
|
||||
.modal { transition: opacity 0.3s; }
|
||||
.modal.hidden { opacity: 0; pointer-events: none; }
|
||||
.gradient-placeholder {
|
||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body class="bg-gray-100 min-h-screen">
|
||||
<!-- Header -->
|
||||
<header class="bg-gradient-to-r from-blue-600 to-purple-600 text-white shadow-lg">
|
||||
<div class="container mx-auto px-4 py-6">
|
||||
<div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
|
||||
<h1 class="text-2xl md:text-3xl font-bold">
|
||||
<i class="fas fa-images mr-2"></i><?= e($pageTitle) ?>
|
||||
</h1>
|
||||
<a href="admin.php" class="text-white/80 hover:text-white text-sm">
|
||||
<i class="fas fa-lock mr-1"></i>Admin
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<!-- Filter-Bereich -->
|
||||
<div class="bg-white shadow-md sticky top-0 z-10">
|
||||
<div class="container mx-auto px-4 py-4">
|
||||
<div class="flex flex-col md:flex-row gap-4">
|
||||
<!-- Suche -->
|
||||
<div class="flex-1">
|
||||
<div class="relative">
|
||||
<input type="text" id="search" placeholder="Album suchen..."
|
||||
class="w-full pl-10 pr-4 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
||||
<i class="fas fa-search absolute left-3 top-3 text-gray-400"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Jahr -->
|
||||
<select id="filter-year" class="px-4 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500">
|
||||
<option value="">Alle Jahre</option>
|
||||
</select>
|
||||
|
||||
<!-- Monat -->
|
||||
<select id="filter-month" class="px-4 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500" disabled>
|
||||
<option value="">Alle Monate</option>
|
||||
</select>
|
||||
|
||||
<!-- Sortierung -->
|
||||
<select id="sort" class="px-4 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500">
|
||||
<option value="newest">Neueste zuerst</option>
|
||||
<option value="oldest">Älteste zuerst</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Album-Grid -->
|
||||
<main class="container mx-auto px-4 py-8">
|
||||
<div id="albums-container" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
|
||||
<!-- Alben werden per JS geladen -->
|
||||
</div>
|
||||
|
||||
<div id="no-results" class="hidden text-center py-12 text-gray-500">
|
||||
<i class="fas fa-search text-4xl mb-4"></i>
|
||||
<p class="text-xl">Keine Alben gefunden</p>
|
||||
</div>
|
||||
|
||||
<div id="loading" class="text-center py-12">
|
||||
<i class="fas fa-spinner fa-spin text-4xl text-blue-500"></i>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<!-- Album-Detail Modal -->
|
||||
<div id="album-modal" class="modal hidden fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
|
||||
<div class="bg-white rounded-xl shadow-2xl max-w-2xl w-full max-h-[90vh] overflow-y-auto">
|
||||
<div class="p-6">
|
||||
<div class="flex justify-between items-start mb-4">
|
||||
<h2 id="modal-title" class="text-2xl font-bold text-gray-800"></h2>
|
||||
<button onclick="closeModal()" class="text-gray-400 hover:text-gray-600">
|
||||
<i class="fas fa-times text-xl"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div id="modal-thumbnail" class="mb-4 rounded-lg overflow-hidden"></div>
|
||||
|
||||
<p id="modal-date" class="text-gray-500 mb-2"></p>
|
||||
<p id="modal-description" class="text-gray-700 mb-4"></p>
|
||||
|
||||
<div id="modal-tags" class="flex flex-wrap gap-2 mb-6"></div>
|
||||
|
||||
<a id="modal-link" href="#" target="_blank"
|
||||
class="inline-block bg-blue-600 text-white px-6 py-3 rounded-lg hover:bg-blue-700 transition mb-6">
|
||||
<i class="fas fa-external-link-alt mr-2"></i>Album öffnen
|
||||
</a>
|
||||
|
||||
<!-- Kommentare -->
|
||||
<div class="border-t pt-6">
|
||||
<h3 class="text-lg font-semibold mb-4">
|
||||
<i class="fas fa-comments mr-2"></i>Kommentare
|
||||
</h3>
|
||||
|
||||
<div id="comments-list" class="space-y-4 mb-6"></div>
|
||||
|
||||
<!-- Kommentar-Formular -->
|
||||
<form id="comment-form" class="bg-gray-50 p-4 rounded-lg">
|
||||
<input type="hidden" id="comment-album-id">
|
||||
<!-- Honeypot -->
|
||||
<input type="text" name="website" id="comment-website" class="hidden" tabindex="-1" autocomplete="off">
|
||||
|
||||
<div class="mb-3">
|
||||
<input type="text" id="comment-author" placeholder="Dein Name" required
|
||||
class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<textarea id="comment-text" placeholder="Dein Kommentar..." required rows="3"
|
||||
class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500"></textarea>
|
||||
</div>
|
||||
<button type="submit" class="bg-green-600 text-white px-4 py-2 rounded-lg hover:bg-green-700 transition">
|
||||
<i class="fas fa-paper-plane mr-2"></i>Absenden
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Footer -->
|
||||
<footer class="bg-gray-800 text-white py-6 mt-12">
|
||||
<div class="container mx-auto px-4 text-center">
|
||||
<p>© <?= date('Y') ?> <?= e($pageTitle) ?></p>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script>
|
||||
// === State ===
|
||||
let allDates = {};
|
||||
let currentAlbumId = null;
|
||||
let debounceTimer = null;
|
||||
|
||||
// === Monatsnamen ===
|
||||
const monthNames = {
|
||||
'01': 'Januar', '02': 'Februar', '03': 'März', '04': 'April',
|
||||
'05': 'Mai', '06': 'Juni', '07': 'Juli', '08': 'August',
|
||||
'09': 'September', '10': 'Oktober', '11': 'November', '12': 'Dezember'
|
||||
};
|
||||
|
||||
// === Helpers ===
|
||||
function escapeHtml(text) {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = text;
|
||||
return div.innerHTML;
|
||||
}
|
||||
|
||||
function formatDate(dateStr) {
|
||||
const [year, month, day] = dateStr.split('-');
|
||||
return `${parseInt(day)}. ${monthNames[month]} ${year}`;
|
||||
}
|
||||
|
||||
function formatDateTime(isoStr) {
|
||||
const date = new Date(isoStr);
|
||||
return date.toLocaleDateString('de-CH', {
|
||||
day: 'numeric',
|
||||
month: 'long',
|
||||
year: 'numeric',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
}
|
||||
|
||||
// === API Calls ===
|
||||
async function fetchAlbums() {
|
||||
const params = new URLSearchParams();
|
||||
|
||||
const year = document.getElementById('filter-year').value;
|
||||
const month = document.getElementById('filter-month').value;
|
||||
const search = document.getElementById('search').value;
|
||||
const sort = document.getElementById('sort').value;
|
||||
|
||||
if (year) params.append('year', year);
|
||||
if (month) params.append('month', month);
|
||||
if (search) params.append('search', search);
|
||||
params.append('sort', sort);
|
||||
|
||||
const response = await fetch(`api.php?action=albums&${params}`);
|
||||
return response.json();
|
||||
}
|
||||
|
||||
async function fetchDates() {
|
||||
const response = await fetch('api.php?action=dates');
|
||||
return response.json();
|
||||
}
|
||||
|
||||
async function fetchComments(albumId) {
|
||||
const response = await fetch(`api.php?action=comments&album_id=${encodeURIComponent(albumId)}`);
|
||||
return response.json();
|
||||
}
|
||||
|
||||
async function postComment(albumId, author, text, website) {
|
||||
const response = await fetch('api.php?action=comment', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ album_id: albumId, author, text, website })
|
||||
});
|
||||
return response.json();
|
||||
}
|
||||
|
||||
// === Rendering ===
|
||||
function renderAlbums(albums) {
|
||||
const container = document.getElementById('albums-container');
|
||||
const noResults = document.getElementById('no-results');
|
||||
const loading = document.getElementById('loading');
|
||||
|
||||
loading.classList.add('hidden');
|
||||
|
||||
if (albums.length === 0) {
|
||||
container.innerHTML = '';
|
||||
noResults.classList.remove('hidden');
|
||||
return;
|
||||
}
|
||||
|
||||
noResults.classList.add('hidden');
|
||||
|
||||
container.innerHTML = albums.map(album => `
|
||||
<div class="album-card bg-white rounded-xl shadow-md overflow-hidden cursor-pointer transition-all duration-300 hover:shadow-xl"
|
||||
data-album='${JSON.stringify(album).replace(/'/g, "'")}'
|
||||
onclick="openModalFromCard(this)">
|
||||
<div class="aspect-video gradient-placeholder flex items-center justify-center">
|
||||
${album.thumbnail
|
||||
? `<img src="${escapeHtml(album.thumbnail)}" alt="${escapeHtml(album.title)}" class="w-full h-full object-cover" onerror="this.parentElement.innerHTML='<i class=\\'fas fa-images text-4xl text-white/50\\'></i>'">`
|
||||
: `<i class="fas fa-images text-4xl text-white/50"></i>`
|
||||
}
|
||||
</div>
|
||||
<div class="p-4">
|
||||
<h3 class="font-semibold text-lg text-gray-800 mb-1 line-clamp-2">${escapeHtml(album.title)}</h3>
|
||||
<p class="text-gray-500 text-sm mb-3">
|
||||
<i class="fas fa-calendar mr-1"></i>${formatDate(album.date)}
|
||||
</p>
|
||||
<div class="flex flex-wrap gap-1">
|
||||
${album.tags.slice(0, 3).map(tag => `
|
||||
<span class="tag bg-blue-100 text-blue-700 text-xs px-2 py-1 rounded-full">${escapeHtml(tag)}</span>
|
||||
`).join('')}
|
||||
${album.tags.length > 3 ? `<span class="text-gray-400 text-xs">+${album.tags.length - 3}</span>` : ''}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
function renderDateFilters(dates) {
|
||||
allDates = dates;
|
||||
const yearSelect = document.getElementById('filter-year');
|
||||
|
||||
yearSelect.innerHTML = '<option value="">Alle Jahre</option>' +
|
||||
Object.keys(dates).map(year => `<option value="${year}">${year}</option>`).join('');
|
||||
}
|
||||
|
||||
function updateMonthFilter() {
|
||||
const year = document.getElementById('filter-year').value;
|
||||
const monthSelect = document.getElementById('filter-month');
|
||||
|
||||
if (!year || !allDates[year]) {
|
||||
monthSelect.innerHTML = '<option value="">Alle Monate</option>';
|
||||
monthSelect.disabled = true;
|
||||
return;
|
||||
}
|
||||
|
||||
monthSelect.disabled = false;
|
||||
monthSelect.innerHTML = '<option value="">Alle Monate</option>' +
|
||||
allDates[year].map(month => `<option value="${month}">${monthNames[month]}</option>`).join('');
|
||||
}
|
||||
|
||||
function renderComments(comments) {
|
||||
const container = document.getElementById('comments-list');
|
||||
|
||||
if (comments.length === 0) {
|
||||
container.innerHTML = '<p class="text-gray-500 text-center italic">Noch keine Kommentare. Sei der Erste!</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
container.innerHTML = comments.map(comment => `
|
||||
<div class="bg-white p-3 rounded-lg border">
|
||||
<div class="flex justify-between items-start mb-1">
|
||||
<span class="font-semibold text-gray-800">${escapeHtml(comment.author)}</span>
|
||||
<span class="text-gray-400 text-xs">${formatDateTime(comment.created_at)}</span>
|
||||
</div>
|
||||
<p class="text-gray-700">${escapeHtml(comment.text)}</p>
|
||||
</div>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
// === Modal ===
|
||||
function openModalFromCard(element) {
|
||||
const album = JSON.parse(element.dataset.album);
|
||||
openModal(album.id, album);
|
||||
}
|
||||
|
||||
function openModal(id, album) {
|
||||
currentAlbumId = id;
|
||||
|
||||
document.getElementById('modal-title').textContent = album.title;
|
||||
document.getElementById('modal-date').innerHTML = `<i class="fas fa-calendar mr-1"></i>${formatDate(album.date)}`;
|
||||
document.getElementById('modal-description').textContent = album.description || 'Keine Beschreibung';
|
||||
document.getElementById('modal-link').href = album.url;
|
||||
document.getElementById('comment-album-id').value = id;
|
||||
|
||||
// Thumbnail
|
||||
const thumbnailContainer = document.getElementById('modal-thumbnail');
|
||||
if (album.thumbnail) {
|
||||
thumbnailContainer.innerHTML = `<img src="${escapeHtml(album.thumbnail)}" alt="${escapeHtml(album.title)}" class="w-full max-h-64 object-cover">`;
|
||||
} else {
|
||||
thumbnailContainer.innerHTML = '';
|
||||
}
|
||||
|
||||
// Tags
|
||||
document.getElementById('modal-tags').innerHTML = album.tags.map(tag =>
|
||||
`<span class="bg-blue-100 text-blue-700 text-sm px-3 py-1 rounded-full">${escapeHtml(tag)}</span>`
|
||||
).join('');
|
||||
|
||||
// Modal anzeigen
|
||||
document.getElementById('album-modal').classList.remove('hidden');
|
||||
document.body.style.overflow = 'hidden';
|
||||
|
||||
// Kommentare laden
|
||||
loadComments(id);
|
||||
}
|
||||
|
||||
function closeModal() {
|
||||
document.getElementById('album-modal').classList.add('hidden');
|
||||
document.body.style.overflow = '';
|
||||
currentAlbumId = null;
|
||||
}
|
||||
|
||||
async function loadComments(albumId) {
|
||||
document.getElementById('comments-list').innerHTML = '<p class="text-center"><i class="fas fa-spinner fa-spin"></i></p>';
|
||||
const data = await fetchComments(albumId);
|
||||
renderComments(data.comments || []);
|
||||
}
|
||||
|
||||
// === Event Listeners ===
|
||||
document.getElementById('search').addEventListener('input', () => {
|
||||
clearTimeout(debounceTimer);
|
||||
debounceTimer = setTimeout(async () => {
|
||||
const data = await fetchAlbums();
|
||||
renderAlbums(data.albums || []);
|
||||
}, 300);
|
||||
});
|
||||
|
||||
document.getElementById('filter-year').addEventListener('change', async () => {
|
||||
updateMonthFilter();
|
||||
document.getElementById('filter-month').value = '';
|
||||
const data = await fetchAlbums();
|
||||
renderAlbums(data.albums || []);
|
||||
});
|
||||
|
||||
document.getElementById('filter-month').addEventListener('change', async () => {
|
||||
const data = await fetchAlbums();
|
||||
renderAlbums(data.albums || []);
|
||||
});
|
||||
|
||||
document.getElementById('sort').addEventListener('change', async () => {
|
||||
const data = await fetchAlbums();
|
||||
renderAlbums(data.albums || []);
|
||||
});
|
||||
|
||||
document.getElementById('comment-form').addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
const albumId = document.getElementById('comment-album-id').value;
|
||||
const author = document.getElementById('comment-author').value.trim();
|
||||
const text = document.getElementById('comment-text').value.trim();
|
||||
const website = document.getElementById('comment-website').value;
|
||||
|
||||
if (!author || !text) return;
|
||||
|
||||
const btn = e.target.querySelector('button[type="submit"]');
|
||||
btn.disabled = true;
|
||||
btn.innerHTML = '<i class="fas fa-spinner fa-spin mr-2"></i>Senden...';
|
||||
|
||||
try {
|
||||
const result = await postComment(albumId, author, text, website);
|
||||
|
||||
if (result.error) {
|
||||
alert(result.error);
|
||||
} else {
|
||||
document.getElementById('comment-text').value = '';
|
||||
await loadComments(albumId);
|
||||
}
|
||||
} catch (err) {
|
||||
alert('Fehler beim Senden des Kommentars');
|
||||
}
|
||||
|
||||
btn.disabled = false;
|
||||
btn.innerHTML = '<i class="fas fa-paper-plane mr-2"></i>Absenden';
|
||||
});
|
||||
|
||||
// Modal schliessen bei Klick ausserhalb
|
||||
document.getElementById('album-modal').addEventListener('click', (e) => {
|
||||
if (e.target.id === 'album-modal') {
|
||||
closeModal();
|
||||
}
|
||||
});
|
||||
|
||||
// Modal schliessen mit Escape
|
||||
document.addEventListener('keydown', (e) => {
|
||||
if (e.key === 'Escape') {
|
||||
closeModal();
|
||||
}
|
||||
});
|
||||
|
||||
// === Init ===
|
||||
async function init() {
|
||||
try {
|
||||
const [albumsData, datesData] = await Promise.all([
|
||||
fetchAlbums(),
|
||||
fetchDates()
|
||||
]);
|
||||
|
||||
renderAlbums(albumsData.albums || []);
|
||||
renderDateFilters(datesData.dates || {});
|
||||
} catch (err) {
|
||||
console.error('Fehler beim Laden:', err);
|
||||
document.getElementById('loading').innerHTML =
|
||||
'<p class="text-red-500"><i class="fas fa-exclamation-triangle mr-2"></i>Fehler beim Laden der Alben</p>';
|
||||
}
|
||||
}
|
||||
|
||||
init();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user