From a36cf56b66d9ced2efc51749a144a86f8e4389cc Mon Sep 17 00:00:00 2001 From: Mischa S Date: Sun, 22 Jun 2014 12:48:59 -0700 Subject: [PATCH] experimenting with osx/Cg --- src/libprojectM/CMakeLists.txt | 1 + .../MilkdropPresetFactory/Parser.hpp | 2 +- src/libprojectM/PresetLoader.cpp | 2 +- src/projectM-iTunes/config.inp | 6 ++-- .../iProjectM.xcodeproj/project.pbxproj | 32 +++++++++++++++++-- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt index ed8fe7cc9..d7dd2658b 100644 --- a/src/libprojectM/CMakeLists.txt +++ b/src/libprojectM/CMakeLists.txt @@ -56,6 +56,7 @@ if (APPLE) SET(USE_OPENMP OFF) SET(BUILD_PROJECTM_STATIC ON) SET(USE_FBO ON) + SET(USE_CG ON) endif(APPLE) ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\") diff --git a/src/libprojectM/MilkdropPresetFactory/Parser.hpp b/src/libprojectM/MilkdropPresetFactory/Parser.hpp index 8c0e19d27..fdbb9e2c0 100755 --- a/src/libprojectM/MilkdropPresetFactory/Parser.hpp +++ b/src/libprojectM/MilkdropPresetFactory/Parser.hpp @@ -29,7 +29,7 @@ #ifndef _PARSER_H #define _PARSER_H //#define PARSE_DEBUG 2 -#define PARSE_DEBUG 0 +#define PARSE_DEBUG 1 #include diff --git a/src/libprojectM/PresetLoader.cpp b/src/libprojectM/PresetLoader.cpp index 6efce8a3f..83e71be06 100644 --- a/src/libprojectM/PresetLoader.cpp +++ b/src/libprojectM/PresetLoader.cpp @@ -144,7 +144,7 @@ std::auto_ptr PresetLoader::loadPreset ( unsigned int index ) const std::auto_ptr PresetLoader::loadPreset ( const std::string & url ) const { - + std::cout << "Loading preset " << url << std::endl; try { /// @bug probably should not use url for preset name diff --git a/src/projectM-iTunes/config.inp b/src/projectM-iTunes/config.inp index 0f8051286..53c81e0d5 100644 --- a/src/projectM-iTunes/config.inp +++ b/src/projectM-iTunes/config.inp @@ -2,8 +2,8 @@ # Configuration File for projectM Texture Size = 2048 # Size of internal rendering texture -Mesh X = 16 # Width of PerPixel Equation mesh -Mesh Y = 9 # Height of PerPixel Equation mesh +Mesh X = 64 # Width of PerPixel Equation mesh +Mesh Y = 36 # Height of PerPixel Equation mesh FPS = 60 # Frames Per Second Fullscreen = false Window Width = 1920 # startup window width @@ -11,7 +11,7 @@ Window Height = 1280 # startup window height Smooth Transition Duration = 5 # in seconds Preset Duration = 20 # in seconds -Easter Egg Parameter = 0 +Easter Egg Parameter = .1 Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent Aspect Correction = true # Custom Shape Aspect Correction diff --git a/src/projectM-iTunes/iProjectM.xcodeproj/project.pbxproj b/src/projectM-iTunes/iProjectM.xcodeproj/project.pbxproj index 9711280cb..c3ad0f4f0 100644 --- a/src/projectM-iTunes/iProjectM.xcodeproj/project.pbxproj +++ b/src/projectM-iTunes/iProjectM.xcodeproj/project.pbxproj @@ -16,6 +16,9 @@ C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81211956D0D9001AC5B5 /* libfreetype.a */; }; C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81231956D0DA001AC5B5 /* libbz2.a */; }; C37822041956D90D0058A694 /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3FAE59C17B88BF800F4B110 /* libprojectM.a */; }; + C3C244321957646D0021FCD4 /* Cg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3C244311957646D0021FCD4 /* Cg.framework */; }; + C3C24433195764780021FCD4 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C244311957646D0021FCD4 /* Cg.framework */; }; + C3C24435195764870021FCD4 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C24434195764870021FCD4 /* libGLEW.a */; }; C3F9D7B317B82CC3009E58CB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9D7B217B82CC3009E58CB /* Cocoa.framework */; }; C3F9D7CF17B831F3009E58CB /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9D7CE17B831F3009E58CB /* OpenGL.framework */; }; C3F9D7D317B83CCB009E58CB /* iprojectM_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C3F9D7D017B83CCB009E58CB /* iprojectM_mac.mm */; }; @@ -30,6 +33,16 @@ /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ + C3C24430195764660021FCD4 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + C3C244321957646D0021FCD4 /* Cg.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C3FAE5A917B898BB00F4B110 /* plist */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -71,6 +84,8 @@ C34E81231956D0DA001AC5B5 /* libbz2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbz2.a; path = macos/contrib/libbz2.a; sourceTree = ""; }; C37821FF1956D82A0058A694 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; }; C37822011956D8B30058A694 /* libprojectM.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libprojectM.2.dylib; path = ../libprojectM/libprojectM.2.dylib; sourceTree = ""; }; + C3C244311957646D0021FCD4 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = macos/contrib/Cg.framework; sourceTree = ""; }; + C3C24434195764870021FCD4 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = macos/contrib/libGLEW.a; sourceTree = ""; }; C3F9D7AF17B82CC3009E58CB /* iProjectM.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iProjectM.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; C3F9D7B217B82CC3009E58CB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; C3F9D7B517B82CC3009E58CB /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; @@ -105,6 +120,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C3C24435195764870021FCD4 /* libGLEW.a in Frameworks */, + C3C24433195764780021FCD4 /* Cg.framework in Frameworks */, C37822041956D90D0058A694 /* libprojectM.a in Frameworks */, C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */, C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */, @@ -125,6 +142,7 @@ C3F9D7A617B82CC3009E58CB = { isa = PBXGroup; children = ( + C3C244311957646D0021FCD4 /* Cg.framework */, C34E81191956D0C3001AC5B5 /* contrib */, C3FAF97A17B8A44100F4B110 /* share */, C3FAE5A417B88C5B00F4B110 /* libprojectM */, @@ -151,6 +169,7 @@ C3F9D7B117B82CC3009E58CB /* Frameworks */ = { isa = PBXGroup; children = ( + C3C24434195764870021FCD4 /* libGLEW.a */, C37822011956D8B30058A694 /* libprojectM.2.dylib */, C37821FF1956D82A0058A694 /* libc++.1.dylib */, C34E81231956D0DA001AC5B5 /* libbz2.a */, @@ -243,6 +262,7 @@ C3F9D7AB17B82CC3009E58CB /* Sources */, C3F9D7AC17B82CC3009E58CB /* Frameworks */, C3FAE5A917B898BB00F4B110 /* plist */, + C3C24430195764660021FCD4 /* CopyFiles */, C3FAF97317B89F1700F4B110 /* share */, C3FAE5AB17B898F800F4B110 /* Generate Installer Package */, ); @@ -325,7 +345,7 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Mac Developer: Sean Cottrell (4GNZ4Z332S)"; + CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; DYLIB_CURRENT_VERSION = 1.0.0; @@ -365,7 +385,7 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Mac Developer: Sean Cottrell (4GNZ4Z332S)"; + CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_LOCATION = YES; @@ -391,6 +411,10 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/macos/contrib", + ); GCC_PRECOMPILE_PREFIX_HEADER = NO; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "iProjectM/iProjectM-Info.plist"; @@ -420,6 +444,10 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/macos/contrib", + ); GCC_PRECOMPILE_PREFIX_HEADER = NO; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "iProjectM/iProjectM-Info.plist";