diff --git a/.hgcheck/hg-checkexec-K69hjC b/.hgcheck/hg-checkexec-K69hjC new file mode 100644 index 0000000..e69de29 diff --git a/KREngine/3rdparty/forsyth/forsyth.cpp b/3rdparty/forsyth/forsyth.cpp similarity index 100% rename from KREngine/3rdparty/forsyth/forsyth.cpp rename to 3rdparty/forsyth/forsyth.cpp diff --git a/KREngine/3rdparty/forsyth/forsyth.h b/3rdparty/forsyth/forsyth.h similarity index 100% rename from KREngine/3rdparty/forsyth/forsyth.h rename to 3rdparty/forsyth/forsyth.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTArray.h b/3rdparty/pvrtexlib/include/PVRTArray.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTArray.h rename to 3rdparty/pvrtexlib/include/PVRTArray.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTDecompress.h b/3rdparty/pvrtexlib/include/PVRTDecompress.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTDecompress.h rename to 3rdparty/pvrtexlib/include/PVRTDecompress.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTError.h b/3rdparty/pvrtexlib/include/PVRTError.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTError.h rename to 3rdparty/pvrtexlib/include/PVRTError.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTGlobal.h b/3rdparty/pvrtexlib/include/PVRTGlobal.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTGlobal.h rename to 3rdparty/pvrtexlib/include/PVRTGlobal.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTMap.h b/3rdparty/pvrtexlib/include/PVRTMap.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTMap.h rename to 3rdparty/pvrtexlib/include/PVRTMap.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTString.h b/3rdparty/pvrtexlib/include/PVRTString.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTString.h rename to 3rdparty/pvrtexlib/include/PVRTString.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTTexture.h b/3rdparty/pvrtexlib/include/PVRTTexture.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTTexture.h rename to 3rdparty/pvrtexlib/include/PVRTTexture.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTexture.h b/3rdparty/pvrtexlib/include/PVRTexture.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTexture.h rename to 3rdparty/pvrtexlib/include/PVRTexture.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTextureDefines.h b/3rdparty/pvrtexlib/include/PVRTextureDefines.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTextureDefines.h rename to 3rdparty/pvrtexlib/include/PVRTextureDefines.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTextureFormat.h b/3rdparty/pvrtexlib/include/PVRTextureFormat.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTextureFormat.h rename to 3rdparty/pvrtexlib/include/PVRTextureFormat.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTextureHeader.h b/3rdparty/pvrtexlib/include/PVRTextureHeader.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTextureHeader.h rename to 3rdparty/pvrtexlib/include/PVRTextureHeader.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTextureUtilities.h b/3rdparty/pvrtexlib/include/PVRTextureUtilities.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTextureUtilities.h rename to 3rdparty/pvrtexlib/include/PVRTextureUtilities.h diff --git a/KREngine/3rdparty/pvrtexlib/include/PVRTextureVersion.h b/3rdparty/pvrtexlib/include/PVRTextureVersion.h similarity index 100% rename from KREngine/3rdparty/pvrtexlib/include/PVRTextureVersion.h rename to 3rdparty/pvrtexlib/include/PVRTextureVersion.h diff --git a/KREngine/3rdparty/pvrtexlib/static_osx/libPVRTexLib.a b/3rdparty/pvrtexlib/static_osx/libPVRTexLib.a similarity index 100% rename from KREngine/3rdparty/pvrtexlib/static_osx/libPVRTexLib.a rename to 3rdparty/pvrtexlib/static_osx/libPVRTexLib.a diff --git a/KREngine/3rdparty/tinyxml2/tinyxml2.cpp b/3rdparty/tinyxml2/tinyxml2.cpp similarity index 100% rename from KREngine/3rdparty/tinyxml2/tinyxml2.cpp rename to 3rdparty/tinyxml2/tinyxml2.cpp diff --git a/KREngine/3rdparty/tinyxml2/tinyxml2.h b/3rdparty/tinyxml2/tinyxml2.h similarity index 100% rename from KREngine/3rdparty/tinyxml2/tinyxml2.h rename to 3rdparty/tinyxml2/tinyxml2.h diff --git a/KREngine/3rdparty/tinyxml2/tinyxml2_readme.txt b/3rdparty/tinyxml2/tinyxml2_readme.txt similarity index 100% rename from KREngine/3rdparty/tinyxml2/tinyxml2_readme.txt rename to 3rdparty/tinyxml2/tinyxml2_readme.txt diff --git a/KREngine/Kraken.xcodeproj/xcuserdata/admin8onf.xcuserdatad/xcschemes/xcschememanagement.plist b/KREngine/Kraken.xcodeproj/xcuserdata/admin8onf.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 300bfdd..0000000 --- a/KREngine/Kraken.xcodeproj/xcuserdata/admin8onf.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,52 +0,0 @@ - - - - - SchemeUserState - - Kraken - ios.xcscheme - - isShown - - - Kraken - osx.xcscheme - - isShown - - - Kraken Standard Assets - OSX.xcscheme - - isShown - - - Kraken Standard Assets - iOS.xcscheme - - isShown - - - - SuppressBuildableAutocreation - - E491016013C99B9E0098455B - - primary - - - E4BBBB7D1512A40300F43B5B - - primary - - - E4C8E4E316B9B2D50031DDCB - - primary - - - E4C8E4F316B9B2E20031DDCB - - primary - - - - - diff --git a/KRWorldBuilder/KRWorldBuilder.xcodeproj/project.pbxproj b/KRWorldBuilder/KRWorldBuilder.xcodeproj/project.pbxproj deleted file mode 100644 index 3ddeb47..0000000 --- a/KRWorldBuilder/KRWorldBuilder.xcodeproj/project.pbxproj +++ /dev/null @@ -1,321 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - E440D976155E46DB00C4887B /* KRWBFileSystemItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E440D975155E46DB00C4887B /* KRWBFileSystemItem.m */; }; - E46F4A07155DF5E500CCF8B8 /* krengine_osx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E46F4A06155DF5E500CCF8B8 /* krengine_osx.framework */; }; - E474D77514E5BBF70017DCEC /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E474D77414E5BBF70017DCEC /* Cocoa.framework */; }; - E474D77F14E5BBF70017DCEC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E474D77D14E5BBF70017DCEC /* InfoPlist.strings */; }; - E474D78114E5BBF70017DCEC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E474D78014E5BBF70017DCEC /* main.m */; }; - E474D78514E5BBF70017DCEC /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = E474D78314E5BBF70017DCEC /* Credits.rtf */; }; - E474D78814E5BBF70017DCEC /* KRWBDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = E474D78714E5BBF70017DCEC /* KRWBDocument.mm */; }; - E474D78B14E5BBF70017DCEC /* KRWBDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = E474D78914E5BBF70017DCEC /* KRWBDocument.xib */; }; - E474D78E14E5BBF80017DCEC /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E474D78C14E5BBF80017DCEC /* MainMenu.xib */; }; - E49BA950162F82C300680C6E /* KRWBFileTreeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E49BA94F162F82C300680C6E /* KRWBFileTreeView.m */; }; - E49BA953162F831800680C6E /* KRWBFileTreeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E49BA952162F831800680C6E /* KRWBFileTreeView.xib */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - E440D974155E46DB00C4887B /* KRWBFileSystemItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KRWBFileSystemItem.h; sourceTree = ""; }; - E440D975155E46DB00C4887B /* KRWBFileSystemItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KRWBFileSystemItem.m; sourceTree = ""; }; - E46F4A06155DF5E500CCF8B8 /* krengine_osx.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = krengine_osx.framework; path = ../KREngine/build/Release/krengine_osx.framework; sourceTree = ""; }; - E474D77014E5BBF70017DCEC /* Kraken World Builder.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Kraken World Builder.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - E474D77414E5BBF70017DCEC /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; - E474D77714E5BBF70017DCEC /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; - E474D77814E5BBF70017DCEC /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; - E474D77914E5BBF70017DCEC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - E474D77C14E5BBF70017DCEC /* KRWorldBuilder-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "KRWorldBuilder-Info.plist"; sourceTree = ""; }; - E474D77E14E5BBF70017DCEC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - E474D78014E5BBF70017DCEC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - E474D78214E5BBF70017DCEC /* KRWorldBuilder-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KRWorldBuilder-Prefix.pch"; sourceTree = ""; }; - E474D78414E5BBF70017DCEC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = ""; }; - E474D78614E5BBF70017DCEC /* KRWBDocument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KRWBDocument.h; sourceTree = ""; }; - E474D78714E5BBF70017DCEC /* KRWBDocument.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = KRWBDocument.mm; sourceTree = ""; }; - E474D78A14E5BBF70017DCEC /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/KRWBDocument.xib; sourceTree = ""; }; - E474D78D14E5BBF80017DCEC /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; - E49BA94E162F82C300680C6E /* KRWBFileTreeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KRWBFileTreeView.h; sourceTree = ""; }; - E49BA94F162F82C300680C6E /* KRWBFileTreeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KRWBFileTreeView.m; sourceTree = ""; }; - E49BA952162F831800680C6E /* KRWBFileTreeView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KRWBFileTreeView.xib; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - E474D76D14E5BBF70017DCEC /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E46F4A07155DF5E500CCF8B8 /* krengine_osx.framework in Frameworks */, - E474D77514E5BBF70017DCEC /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - E474D76514E5BBF70017DCEC = { - isa = PBXGroup; - children = ( - E474D77A14E5BBF70017DCEC /* KRWorldBuilder */, - E474D77314E5BBF70017DCEC /* Frameworks */, - E474D77114E5BBF70017DCEC /* Products */, - ); - sourceTree = ""; - }; - E474D77114E5BBF70017DCEC /* Products */ = { - isa = PBXGroup; - children = ( - E474D77014E5BBF70017DCEC /* Kraken World Builder.app */, - ); - name = Products; - sourceTree = ""; - }; - E474D77314E5BBF70017DCEC /* Frameworks */ = { - isa = PBXGroup; - children = ( - E46F4A06155DF5E500CCF8B8 /* krengine_osx.framework */, - E474D77714E5BBF70017DCEC /* AppKit.framework */, - E474D77814E5BBF70017DCEC /* CoreData.framework */, - E474D77914E5BBF70017DCEC /* Foundation.framework */, - E474D77414E5BBF70017DCEC /* Cocoa.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - E474D77A14E5BBF70017DCEC /* KRWorldBuilder */ = { - isa = PBXGroup; - children = ( - E474D78614E5BBF70017DCEC /* KRWBDocument.h */, - E474D78714E5BBF70017DCEC /* KRWBDocument.mm */, - E474D78914E5BBF70017DCEC /* KRWBDocument.xib */, - E440D974155E46DB00C4887B /* KRWBFileSystemItem.h */, - E440D975155E46DB00C4887B /* KRWBFileSystemItem.m */, - E474D78C14E5BBF80017DCEC /* MainMenu.xib */, - E474D77B14E5BBF70017DCEC /* Supporting Files */, - E49BA94E162F82C300680C6E /* KRWBFileTreeView.h */, - E49BA94F162F82C300680C6E /* KRWBFileTreeView.m */, - E49BA952162F831800680C6E /* KRWBFileTreeView.xib */, - ); - path = KRWorldBuilder; - sourceTree = ""; - }; - E474D77B14E5BBF70017DCEC /* Supporting Files */ = { - isa = PBXGroup; - children = ( - E474D77C14E5BBF70017DCEC /* KRWorldBuilder-Info.plist */, - E474D77D14E5BBF70017DCEC /* InfoPlist.strings */, - E474D78014E5BBF70017DCEC /* main.m */, - E474D78214E5BBF70017DCEC /* KRWorldBuilder-Prefix.pch */, - E474D78314E5BBF70017DCEC /* Credits.rtf */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - E474D76F14E5BBF70017DCEC /* Kraken World Builder */ = { - isa = PBXNativeTarget; - buildConfigurationList = E474D79114E5BBF80017DCEC /* Build configuration list for PBXNativeTarget "Kraken World Builder" */; - buildPhases = ( - E474D76C14E5BBF70017DCEC /* Sources */, - E474D76D14E5BBF70017DCEC /* Frameworks */, - E474D76E14E5BBF70017DCEC /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Kraken World Builder"; - productName = KRWorldBuilder; - productReference = E474D77014E5BBF70017DCEC /* Kraken World Builder.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E474D76714E5BBF70017DCEC /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0420; - ORGANIZATIONNAME = "Kearwood Software"; - }; - buildConfigurationList = E474D76A14E5BBF70017DCEC /* Build configuration list for PBXProject "KRWorldBuilder" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = E474D76514E5BBF70017DCEC; - productRefGroup = E474D77114E5BBF70017DCEC /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - E474D76F14E5BBF70017DCEC /* Kraken World Builder */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - E474D76E14E5BBF70017DCEC /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E474D77F14E5BBF70017DCEC /* InfoPlist.strings in Resources */, - E474D78514E5BBF70017DCEC /* Credits.rtf in Resources */, - E474D78B14E5BBF70017DCEC /* KRWBDocument.xib in Resources */, - E474D78E14E5BBF80017DCEC /* MainMenu.xib in Resources */, - E49BA953162F831800680C6E /* KRWBFileTreeView.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - E474D76C14E5BBF70017DCEC /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E474D78114E5BBF70017DCEC /* main.m in Sources */, - E474D78814E5BBF70017DCEC /* KRWBDocument.mm in Sources */, - E440D976155E46DB00C4887B /* KRWBFileSystemItem.m in Sources */, - E49BA950162F82C300680C6E /* KRWBFileTreeView.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - E474D77D14E5BBF70017DCEC /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - E474D77E14E5BBF70017DCEC /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - E474D78314E5BBF70017DCEC /* Credits.rtf */ = { - isa = PBXVariantGroup; - children = ( - E474D78414E5BBF70017DCEC /* en */, - ); - name = Credits.rtf; - sourceTree = ""; - }; - E474D78914E5BBF70017DCEC /* KRWBDocument.xib */ = { - isa = PBXVariantGroup; - children = ( - E474D78A14E5BBF70017DCEC /* en */, - ); - name = KRWBDocument.xib; - sourceTree = ""; - }; - E474D78C14E5BBF80017DCEC /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - E474D78D14E5BBF80017DCEC /* en */, - ); - name = MainMenu.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - E474D78F14E5BBF80017DCEC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - E474D79014E5BBF80017DCEC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; - SDKROOT = macosx; - }; - name = Release; - }; - E474D79214E5BBF80017DCEC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "KRWorldBuilder/KRWorldBuilder-Prefix.pch"; - INFOPLIST_FILE = "KRWorldBuilder/KRWorldBuilder-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - E474D79314E5BBF80017DCEC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "KRWorldBuilder/KRWorldBuilder-Prefix.pch"; - INFOPLIST_FILE = "KRWorldBuilder/KRWorldBuilder-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - E474D76A14E5BBF70017DCEC /* Build configuration list for PBXProject "KRWorldBuilder" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E474D78F14E5BBF80017DCEC /* Debug */, - E474D79014E5BBF80017DCEC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E474D79114E5BBF80017DCEC /* Build configuration list for PBXNativeTarget "Kraken World Builder" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E474D79214E5BBF80017DCEC /* Debug */, - E474D79314E5BBF80017DCEC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = E474D76714E5BBF70017DCEC /* Project object */; -} diff --git a/KRWorldBuilder/KRWorldBuilder.xcodeproj/xcuserdata/kearwood.xcuserdatad/xcschemes/KRWorldBuilder.xcscheme b/KRWorldBuilder/KRWorldBuilder.xcodeproj/xcuserdata/kearwood.xcuserdatad/xcschemes/KRWorldBuilder.xcscheme deleted file mode 100644 index aebace6..0000000 --- a/KRWorldBuilder/KRWorldBuilder.xcodeproj/xcuserdata/kearwood.xcuserdatad/xcschemes/KRWorldBuilder.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/KRWorldBuilder/KRWorldBuilder.xcodeproj/xcuserdata/kearwood.xcuserdatad/xcschemes/xcschememanagement.plist b/KRWorldBuilder/KRWorldBuilder.xcodeproj/xcuserdata/kearwood.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index b0162ed..0000000 --- a/KRWorldBuilder/KRWorldBuilder.xcodeproj/xcuserdata/kearwood.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - KRWorldBuilder.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - E474D76F14E5BBF70017DCEC - - primary - - - - - diff --git a/KRWorldBuilder/KRWorldBuilder/KRWBDocument.h b/KRWorldBuilder/KRWorldBuilder/KRWBDocument.h deleted file mode 100644 index 3b1da0c..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWBDocument.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// KRWBDocument.h -// KRWorldBuilder -// -// Created by Kearwood Gilbert on 12-02-10. -// Copyright (c) 2012 Kearwood Software. All rights reserved. -// - -#import - -class KRContext; - -@interface KRWBDocument : NSDocument - -@property (nonatomic, readonly) KRContext *world; -@property (nonatomic, retain) IBOutlet NSOutlineView *outlineView; - -@end diff --git a/KRWorldBuilder/KRWorldBuilder/KRWBDocument.mm b/KRWorldBuilder/KRWorldBuilder/KRWBDocument.mm deleted file mode 100644 index 03997b4..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWBDocument.mm +++ /dev/null @@ -1,131 +0,0 @@ -// -// KRWBDocument.m -// KRWorldBuilder -// -// Created by Kearwood Gilbert on 12-02-10. -// Copyright (c) 2012 Kearwood Software. All rights reserved. -// - -#import "KRWBDocument.h" - -#import -#import -#import -#import "KRWBFileSystemItem.h" - -@interface KRWBDocument() { - KRContext *_world; - NSOutlineView *_outlineView; -} - -@end - -@implementation KRWBDocument - -@synthesize outlineView = _outlineView; - -- (KRContext *)world -{ - return _world; -} - -- (id)init -{ - _world = NULL; - self = [super init]; - if (self) { - // Add your subclass-specific initialization here. - // If an error occurs here, return nil. - _world = new KRContext(); - } - return self; -} - -- (void)dealloc -{ - if(_world) { - delete _world; - _world = NULL; - } -} - -- (NSString *)windowNibName -{ - // Override returning the nib file name of the document - // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead. - return @"KRWBDocument"; -} - -- (void)windowControllerDidLoadNib:(NSWindowController *)aController -{ - [super windowControllerDidLoadNib:aController]; - - //[[self.windowControllers objectAtIndex:0] setBackgroundColor: [NSColor blackColor]]; - // Add any code here that needs to be executed once the windowController has loaded the document's window. -} - -- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError -{ - /* - Insert code here to write your document to data of the specified type. If outError != NULL, ensure that you create and set an appropriate error when returning nil. - You can also choose to override -fileWrapperOfType:error:, -writeToURL:ofType:error:, or -writeToURL:ofType:forSaveOperation:originalContentsURL:error: instead. - */ - NSException *exception = [NSException exceptionWithName:@"UnimplementedMethod" reason:[NSString stringWithFormat:@"%@ is unimplemented", NSStringFromSelector(_cmd)] userInfo:nil]; - @throw exception; - return nil; -} - -- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError -{ - /* - Insert code here to read your document from the given data of the specified type. If outError != NULL, ensure that you create and set an appropriate error when returning NO. - You can also choose to override -readFromFileWrapper:ofType:error: or -readFromURL:ofType:error: instead. - If you override either of these, you should also override -isEntireFileLoaded to return NO if the contents are lazily loaded. - */ - /* - NSException *exception = [NSException exceptionWithName:@"UnimplementedMethod" reason:[NSString stringWithFormat:@"%@ is unimplemented", NSStringFromSelector(_cmd)] userInfo:nil]; - @throw exception; - */ - if(_world) delete _world; - _world = new KRContext(); - - - return YES; -} - -+ (BOOL)autosavesInPlace -{ - return YES; -} - - -- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { - if(item == nil) { - return [[KRWBFileSystemItem rootItem] numberOfChildren]; - } else { - return [item numberOfChildren]; - } - //return (item == nil) ? 1 : [item numberOfChildren]; -} - - -- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item { - return (item == nil) ? YES : ([item numberOfChildren] != -1); -} - - -- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item { - if(item == nil) { - return [[KRWBFileSystemItem rootItem] childAtIndex:index]; - } else { - return [(KRWBFileSystemItem *)item childAtIndex:index]; - } - //return (item == nil) ? [KRWBFileSystemItem rootItem] : [(KRWBFileSystemItem *)item childAtIndex:index]; -} - - -- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item { - return (item == nil) ? @"/" : [item relativePath]; -} - -@end diff --git a/KRWorldBuilder/KRWorldBuilder/KRWBFileSystemItem.h b/KRWorldBuilder/KRWorldBuilder/KRWBFileSystemItem.h deleted file mode 100644 index 570df4d..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWBFileSystemItem.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// KRWBFileSystemItem.h -// KRWorldBuilder -// -// Created by Kearwood Gilbert on 12-05-12. -// Copyright (c) 2012 Kearwood Software. All rights reserved. -// - -#import - -@interface KRWBFileSystemItem : NSObject -{ - NSURL *fullPath; - KRWBFileSystemItem *parent; - NSMutableArray *children; -} - -+ (KRWBFileSystemItem *)rootItem; -- (NSInteger)numberOfChildren;// Returns -1 for leaf nodes -- (KRWBFileSystemItem *)childAtIndex:(NSUInteger)n; // Invalid to call on leaf nodes -- (NSURL *)fullPath; -- (NSString *)relativePath; - -@end - diff --git a/KRWorldBuilder/KRWorldBuilder/KRWBFileSystemItem.m b/KRWorldBuilder/KRWorldBuilder/KRWBFileSystemItem.m deleted file mode 100644 index 50ae220..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWBFileSystemItem.m +++ /dev/null @@ -1,109 +0,0 @@ -// -// KRWBFileSystemItem.m -// KRWorldBuilder -// -// Created by Kearwood Gilbert on 12-05-12. -// Copyright (c) 2012 Kearwood Software. All rights reserved. -// - -#import "KRWBFileSystemItem.h" - - -@implementation KRWBFileSystemItem - -static KRWBFileSystemItem *rootItem = nil; -static NSMutableArray *leafNode = nil; - -+ (void)initialize { - if (self == [KRWBFileSystemItem class]) { - leafNode = [[NSMutableArray alloc] init]; - } -} - -- (id)initWithPath:(NSURL *)url parent:(KRWBFileSystemItem *)parentItem { - self = [super init]; - if (self) { - fullPath = url; - parent = parentItem; - } - return self; -} - - -+ (KRWBFileSystemItem *)rootItem { - if (rootItem == nil) { - rootItem = [[KRWBFileSystemItem alloc] initWithPath:[NSURL URLWithString:@"file://localhost/"] parent:nil]; - } - return rootItem; -} - - -// Creates, caches, and returns the array of children -// Loads children incrementally -- (NSArray *)children { - - if (children == nil) { - NSFileManager *fileManager = [NSFileManager defaultManager]; - NSError *error; - - BOOL valid = [fullPath checkResourceIsReachableAndReturnError:NULL]; - - - NSNumber *isDirectory = nil; - if (! [fullPath getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:&error]) { - // handle error - } - - BOOL isDir = [isDirectory boolValue]; - if (valid && isDir) { - NSArray *keys = [NSArray arrayWithObject:NSURLIsDirectoryKey]; - - NSArray *child_urls = [fileManager contentsOfDirectoryAtURL:fullPath includingPropertiesForKeys:keys options: NSDirectoryEnumerationSkipsHiddenFiles error:&error]; - /* - NSDirectoryEnumerator *enumerator = [fileManager - enumeratorAtURL:fullPath - includingPropertiesForKeys:keys - options:0 - errorHandler:^(NSURL *url, NSError *error) { - // Handle the error. - // Return YES if the enumeration should continue after the error. - return YES; - }]; - */ - - children = [[NSMutableArray alloc] init]; - - for (NSURL *url in child_urls) { - KRWBFileSystemItem *newChild = [[KRWBFileSystemItem alloc] - initWithPath:url parent:self]; - [children addObject:newChild]; - } - } else { - children = leafNode; - } - } - return children; -} - - -- (NSString *)relativePath { - return [[fullPath lastPathComponent] copy]; -} - - -- (KRWBFileSystemItem *)childAtIndex:(NSUInteger)n { - return [[self children] objectAtIndex:n]; -} - - -- (NSInteger)numberOfChildren { - NSArray *tmp = [self children]; - return (tmp == leafNode) ? (-1) : [tmp count]; -} - - -- (void)dealloc { - -} - -@end \ No newline at end of file diff --git a/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.h b/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.h deleted file mode 100644 index 2cac446..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// KRWBFileTreeView.h -// KRWorldBuilder -// -// Created by Kearwood Gilbert on 2012-10-17. -// Copyright (c) 2012 Kearwood Software. All rights reserved. -// - -#import - -@interface KRWBFileTreeView : NSView - -@property (nonatomic, retain) NSString *basePath; - -@end diff --git a/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.m b/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.m deleted file mode 100644 index 52b8474..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.m +++ /dev/null @@ -1,79 +0,0 @@ -// -// KRWBFileTreeView.m -// KRWorldBuilder -// -// Created by Kearwood Gilbert on 2012-10-17. -// Copyright (c) 2012 Kearwood Software. All rights reserved. -// - -#import "KRWBFileTreeView.h" -#import "KRWBFileSystemItem.h" - -@interface KRWBFileTreeView() -@property (nonatomic, retain) IBOutlet NSOutlineView *outlineView; -@end - -@implementation KRWBFileTreeView - --(void)commonInit -{ - -} - -- (id)initWithCoder:(NSCoder *)aDecoder -{ - self = [super initWithCoder:aDecoder]; - if (self) { - [self commonInit]; - } - - return self; -} - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self commonInit]; - } - - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - // Drawing code here. -} - - -- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { - if(item == nil) { - return [[KRWBFileSystemItem rootItem] numberOfChildren]; - } else { - return [item numberOfChildren]; - } - //return (item == nil) ? 1 : [item numberOfChildren]; -} - - -- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item { - return (item == nil) ? YES : ([item numberOfChildren] != -1); -} - - -- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item { - if(item == nil) { - return [[KRWBFileSystemItem rootItem] childAtIndex:index]; - } else { - return [(KRWBFileSystemItem *)item childAtIndex:index]; - } - //return (item == nil) ? [KRWBFileSystemItem rootItem] : [(KRWBFileSystemItem *)item childAtIndex:index]; -} - - -- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item { - return (item == nil) ? @"/" : [item relativePath]; -} - - -@end diff --git a/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.xib b/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.xib deleted file mode 100644 index 314a69a..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWBFileTreeView.xib +++ /dev/null @@ -1,433 +0,0 @@ - - - - 1080 - 12C60 - 2843 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2843 - - - IBNSLayoutConstraint - NSCustomObject - NSCustomView - NSOutlineView - NSScrollView - NSScroller - NSTableColumn - NSTextFieldCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - KRWBFileTreeView - - - FirstResponder - - - NSApplication - - - - 268 - - - - 268 - - - - 2304 - - - - 256 - {298, 536} - - - _NS:1703 - YES - NO - YES - - - -2147483392 - {{224, 0}, {16, 17}} - _NS:1709 - - - - 295 - 16 - 1000 - - 75497536 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337641536 - 2048 - Text Cell - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 3 - 2 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -767557632 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {298, 536} - - - _NS:1701 - - - 6 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - _NS:1726 - NO - - _doScroller: - 0.99805447470817121 - - - - -2147483392 - {{0, 498}, {209, 15}} - - - _NS:1728 - NO - 1 - - _doScroller: - 0.99523809523809526 - - - {298, 536} - - - _NS:1699 - 264752 - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - {298, 536} - - - NSView - - - - - - - outlineView - - - - 43 - - - - delegate - - - - 44 - - - - dataSource - - - - 45 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - 4 - 0 - - 4 - 1 - - 0.0 - - 1000 - - 9 - 40 - 3 - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - - - - 5 - - - - - - - - - - 8 - - - - - - - - 7 - - - - - 6 - - - - - 9 - - - - - - - - 10 - - - - - 33 - - - - - 34 - - - - - 35 - - - - - 37 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 45 - - - 0 - IBCocoaFramework - YES - 3 - YES - - diff --git a/KRWorldBuilder/KRWorldBuilder/KRWorldBuilder-Info.plist b/KRWorldBuilder/KRWorldBuilder/KRWorldBuilder-Info.plist deleted file mode 100644 index 54323f5..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWorldBuilder-Info.plist +++ /dev/null @@ -1,58 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - fbx - krbundle - - CFBundleTypeIconFile - - CFBundleTypeName - KREngine World - CFBundleTypeOSTypes - - ???? - - CFBundleTypeRole - Editor - NSDocumentClass - KRWBDocument - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.kearwood.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSApplicationCategoryType - public.app-category.developer-tools - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSHumanReadableCopyright - Copyright © 2012 Kearwood Software. All rights reserved. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/KRWorldBuilder/KRWorldBuilder/KRWorldBuilder-Prefix.pch b/KRWorldBuilder/KRWorldBuilder/KRWorldBuilder-Prefix.pch deleted file mode 100644 index 77ea068..0000000 --- a/KRWorldBuilder/KRWorldBuilder/KRWorldBuilder-Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'KRWorldBuilder' target in the 'KRWorldBuilder' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/KRWorldBuilder/KRWorldBuilder/en.lproj/Credits.rtf b/KRWorldBuilder/KRWorldBuilder/en.lproj/Credits.rtf deleted file mode 100644 index 46576ef..0000000 --- a/KRWorldBuilder/KRWorldBuilder/en.lproj/Credits.rtf +++ /dev/null @@ -1,29 +0,0 @@ -{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;} -{\colortbl;\red255\green255\blue255;} -\paperw9840\paperh8400 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 Engineering: -\b0 \ - Some people\ -\ - -\b Human Interface Design: -\b0 \ - Some other people\ -\ - -\b Testing: -\b0 \ - Hopefully not nobody\ -\ - -\b Documentation: -\b0 \ - Whoever\ -\ - -\b With special thanks to: -\b0 \ - Mom\ -} diff --git a/KRWorldBuilder/KRWorldBuilder/en.lproj/InfoPlist.strings b/KRWorldBuilder/KRWorldBuilder/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/KRWorldBuilder/KRWorldBuilder/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/KRWorldBuilder/KRWorldBuilder/en.lproj/KRWBDocument.xib b/KRWorldBuilder/KRWorldBuilder/en.lproj/KRWBDocument.xib deleted file mode 100644 index 994bf92..0000000 --- a/KRWorldBuilder/KRWorldBuilder/en.lproj/KRWBDocument.xib +++ /dev/null @@ -1,885 +0,0 @@ - - - - 1080 - 12C60 - 2843 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2843 - - - IBNSLayoutConstraint - NSCollectionView - NSCollectionViewItem - NSCustomObject - NSCustomView - NSOutlineView - NSScrollView - NSScroller - NSSplitView - NSTableColumn - NSTextFieldCell - NSToolbar - NSToolbarFlexibleSpaceItem - NSToolbarItem - NSToolbarSeparatorItem - NSToolbarSpaceItem - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - KRWBDocument - - - FirstResponder - - - 15 - 2 - {{133, 235}, {857, 513}} - 1886912512 - Window - NSWindow - - - 842C33E8-53BA-4CA1-A73F-FE07B70F5DBB - - - YES - YES - YES - NO - 1 - 2 - - - NSToolbarCustomizeToolbarItem - Customize - Customize - Customize Toolbar - - - NSImage - NSToolbarCustomize - - - runToolbarCustomizationPalette: - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - NSToolbarFlexibleSpaceItem - - Flexible Space - - - - - - {1, 5} - {20000, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - - - - NSToolbarSeparatorItem - - Separator - - - - - - {12, 5} - {12, 1000} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - NSToolbarShowColorsItem - Colors - Colors - Show Color Panel - - - NSImage - NSToolbarShowColors - - - orderFrontColorPanel: - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - NSToolbarShowFontsItem - Fonts - Fonts - Show Font Panel - - - NSImage - NSToolbarShowFonts - - - orderFrontFontPanel: - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - NSToolbarSpaceItem - - Space - - - - - - {32, 5} - {32, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - - - - - - - - - - - - - - - - - - - - {94, 86} - - - 256 - - - - 274 - - - - 268 - - - - 2304 - - - - 256 - {244, 513} - - - _NS:1703 - YES - NO - YES - - - -2147483392 - {{224, 0}, {16, 17}} - _NS:1709 - - - - 241 - 16 - 1000 - - 75497536 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337641536 - 2048 - Text Cell - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 3 - 2 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -767557632 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {244, 513} - - - _NS:1701 - - - 6 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - _NS:1726 - NO - - _doScroller: - 0.99805447470817121 - - - - -2147483392 - {{0, 498}, {209, 15}} - - - _NS:1728 - NO - 1 - - _doScroller: - 0.99523809523809526 - - - {244, 513} - - - _NS:1699 - 264752 - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 4352 - {{245, 0}, {411, 513}} - - - _NS:1165 - NSView - - - - 268 - - - - 2304 - - - - 274 - {200, 513} - - - _NS:3367 - {0, 0} - {0, 0} - 0 - 0 - - - - -1 - 0 - - - {200, 513} - - - _NS:3365 - - - 6 - System - controlColor - - - 4 - - - - -2147483392 - {{234, 1}, {15, 143}} - - - _NS:3372 - NO - - _doScroller: - 1 - 0.89655172824859619 - - - - -2147483392 - {{1, 144}, {233, 15}} - - _NS:3374 - NO - 1 - - _doScroller: - 0.63157892227172852 - - - {{657, 0}, {200, 513}} - - - _NS:3363 - 133680 - - - - 0.25 - 4 - 1 - - - {857, 513} - - - _NS:1163 - YES - 2 - - - {857, 513} - - - YES - - {{0, 0}, {1920, 1178}} - {94, 155} - {10000000000000, 10000000000000} - 128 - YES - - - NSApplication - - - - - - - - window - - - - 18 - - - - outlineView - - - - 100069 - - - - delegate - - - - 17 - - - - itemPrototype - - - - 100052 - - - - dataSource - - - - 100067 - - - - delegate - - - - 100068 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 5 - - - - - - - Window - - - 6 - - - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 4 - 0 - - 4 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - - - -3 - - - Application - - - 100021 - - - - - - - - - - - - - 100022 - - - - - 100023 - - - - - 100025 - - - - - 100026 - - - - - 100027 - - - - - 100028 - - - - - 100029 - - - - - - - - - - 100030 - - - - - - 100046 - - - - - - - - - - 100047 - - - - - 100048 - - - - - 100049 - - - - - 100050 - - - - - 100054 - - - - - - - - - - 100055 - - - - - - - - 100056 - - - - - 100058 - - - - - 100059 - - - - - - - - 100062 - - - - - 100080 - - - - - 100081 - - - - - 100082 - - - - - 100083 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{133, 170}, {507, 413}} - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - 100083 - - - 0 - IBCocoaFramework - YES - 3 - - {11, 11} - {10, 3} - {32, 32} - {32, 32} - {32, 32} - - YES - - diff --git a/KRWorldBuilder/KRWorldBuilder/en.lproj/MainMenu.xib b/KRWorldBuilder/KRWorldBuilder/en.lproj/MainMenu.xib deleted file mode 100644 index b66e042..0000000 --- a/KRWorldBuilder/KRWorldBuilder/en.lproj/MainMenu.xib +++ /dev/null @@ -1,3105 +0,0 @@ - - - - 1080 - 12C60 - 2844 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2844 - - - NSCustomObject - NSMenu - NSMenuItem - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - - - Kraken World Builder - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - Kraken World Builder - - - - About Kraken World Builder - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide KRWorldBuilder - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit KRWorldBuilder - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - File - - 1048576 - 2147483647 - - - submenuAction: - - File - - - - New - n - 1048576 - 2147483647 - - - - - - Open… - o - 1048576 - 2147483647 - - - - - - Open Recent - - 1048576 - 2147483647 - - - submenuAction: - - Open Recent - - - - Clear Menu - - 1048576 - 2147483647 - - - - - _NSRecentDocumentsMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Close - w - 1048576 - 2147483647 - - - - - - Save… - s - 1048576 - 2147483647 - - - - - - Revert to Saved - - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - Edit - - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Paste and Match Style - V - 1572864 - 2147483647 - - - - - - Delete - - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Find - - 1048576 - 2147483647 - - - submenuAction: - - Find - - - - Find… - f - 1048576 - 2147483647 - - - 1 - - - - Find and Replace… - f - 1572864 - 2147483647 - - - 12 - - - - Find Next - g - 1048576 - 2147483647 - - - 2 - - - - Find Previous - G - 1179648 - 2147483647 - - - 3 - - - - Use Selection for Find - e - 1048576 - 2147483647 - - - 7 - - - - Jump to Selection - j - 1048576 - 2147483647 - - - - - - - - - Spelling and Grammar - - 1048576 - 2147483647 - - - submenuAction: - - Spelling and Grammar - - - - Show Spelling and Grammar - : - 1048576 - 2147483647 - - - - - - Check Document Now - ; - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Check Spelling While Typing - - 1048576 - 2147483647 - - - - - - Check Grammar With Spelling - - 1048576 - 2147483647 - - - - - - Correct Spelling Automatically - - 2147483647 - - - - - - - - - Substitutions - - 1048576 - 2147483647 - - - submenuAction: - - Substitutions - - - - Show Substitutions - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Smart Copy/Paste - f - 1048576 - 2147483647 - - - 1 - - - - Smart Quotes - g - 1048576 - 2147483647 - - - 2 - - - - Smart Dashes - - 2147483647 - - - - - - Smart Links - G - 1179648 - 2147483647 - - - 3 - - - - Text Replacement - - 2147483647 - - - - - - - - - Transformations - - 2147483647 - - - submenuAction: - - Transformations - - - - Make Upper Case - - 2147483647 - - - - - - Make Lower Case - - 2147483647 - - - - - - Capitalize - - 2147483647 - - - - - - - - - Speech - - 1048576 - 2147483647 - - - submenuAction: - - Speech - - - - Start Speaking - - 1048576 - 2147483647 - - - - - - Stop Speaking - - 1048576 - 2147483647 - - - - - - - - - - - - Format - - 2147483647 - - - submenuAction: - - Format - - - - Font - - 2147483647 - - - submenuAction: - - Font - - - - Show Fonts - t - 1048576 - 2147483647 - - - - - - Bold - b - 1048576 - 2147483647 - - - 2 - - - - Italic - i - 1048576 - 2147483647 - - - 1 - - - - Underline - u - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Bigger - + - 1048576 - 2147483647 - - - 3 - - - - Smaller - - - 1048576 - 2147483647 - - - 4 - - - - YES - YES - - - 2147483647 - - - - - - Kern - - 2147483647 - - - submenuAction: - - Kern - - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Tighten - - 2147483647 - - - - - - Loosen - - 2147483647 - - - - - - - - - Ligature - - 2147483647 - - - submenuAction: - - Ligature - - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Use All - - 2147483647 - - - - - - - - - Baseline - - 2147483647 - - - submenuAction: - - Baseline - - - - Use Default - - 2147483647 - - - - - - Superscript - - 2147483647 - - - - - - Subscript - - 2147483647 - - - - - - Raise - - 2147483647 - - - - - - Lower - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Colors - C - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Copy Style - c - 1572864 - 2147483647 - - - - - - Paste Style - v - 1572864 - 2147483647 - - - - - _NSFontMenu - - - - - Text - - 2147483647 - - - submenuAction: - - Text - - - - Align Left - { - 1048576 - 2147483647 - - - - - - Center - | - 1048576 - 2147483647 - - - - - - Justify - - 2147483647 - - - - - - Align Right - } - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Writing Direction - - 2147483647 - - - submenuAction: - - Writing Direction - - - - YES - Paragraph - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Selection - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Ruler - - 2147483647 - - - - - - Copy Ruler - c - 1310720 - 2147483647 - - - - - - Paste Ruler - v - 1310720 - 2147483647 - - - - - - - - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - - - Show Toolbar - t - 1572864 - 2147483647 - - - - - - Customize Toolbar… - - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - - - KRWorldBuilder Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - NSFontManager - - - - - - - terminate: - - - - 448 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - clearRecentDocuments: - - - - 127 - - - - performClose: - - - - 193 - - - - toggleContinuousSpellChecking: - - - - 222 - - - - undo: - - - - 223 - - - - copy: - - - - 224 - - - - checkSpelling: - - - - 225 - - - - paste: - - - - 226 - - - - stopSpeaking: - - - - 227 - - - - cut: - - - - 228 - - - - showGuessPanel: - - - - 230 - - - - redo: - - - - 231 - - - - selectAll: - - - - 232 - - - - startSpeaking: - - - - 233 - - - - delete: - - - - 235 - - - - performZoom: - - - - 240 - - - - performFindPanelAction: - - - - 241 - - - - centerSelectionInVisibleArea: - - - - 245 - - - - toggleGrammarChecking: - - - - 347 - - - - toggleSmartInsertDelete: - - - - 355 - - - - toggleAutomaticQuoteSubstitution: - - - - 356 - - - - toggleAutomaticLinkDetection: - - - - 357 - - - - saveDocument: - - - - 362 - - - - revertDocumentToSaved: - - - - 364 - - - - runToolbarCustomizationPalette: - - - - 365 - - - - toggleToolbarShown: - - - - 366 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - newDocument: - - - - 371 - - - - openDocument: - - - - 372 - - - - raiseBaseline: - - - - 425 - - - - lowerBaseline: - - - - 426 - - - - copyFont: - - - - 427 - - - - subscript: - - - - 428 - - - - superscript: - - - - 429 - - - - tightenKerning: - - - - 430 - - - - underline: - - - - 431 - - - - orderFrontColorPanel: - - - - 432 - - - - useAllLigatures: - - - - 433 - - - - loosenKerning: - - - - 434 - - - - pasteFont: - - - - 435 - - - - unscript: - - - - 436 - - - - useStandardKerning: - - - - 437 - - - - useStandardLigatures: - - - - 438 - - - - turnOffLigatures: - - - - 439 - - - - turnOffKerning: - - - - 440 - - - - capitalizeWord: - - - - 454 - - - - lowercaseWord: - - - - 455 - - - - uppercaseWord: - - - - 456 - - - - toggleAutomaticDashSubstitution: - - - - 460 - - - - orderFrontSubstitutionsPanel: - - - - 461 - - - - toggleAutomaticTextReplacement: - - - - 463 - - - - toggleAutomaticSpellingCorrection: - - - - 466 - - - - performFindPanelAction: - - - - 467 - - - - performFindPanelAction: - - - - 468 - - - - performFindPanelAction: - - - - 469 - - - - pasteAsPlainText: - - - - 471 - - - - showHelp: - - - - 494 - - - - alignCenter: - - - - 517 - - - - pasteRuler: - - - - 518 - - - - toggleRuler: - - - - 519 - - - - alignRight: - - - - 520 - - - - copyRuler: - - - - 521 - - - - alignJustified: - - - - 522 - - - - alignLeft: - - - - 523 - - - - makeBaseWritingDirectionNatural: - - - - 524 - - - - makeBaseWritingDirectionLeftToRight: - - - - 525 - - - - makeBaseWritingDirectionRightToLeft: - - - - 526 - - - - makeTextWritingDirectionNatural: - - - - 527 - - - - makeTextWritingDirectionLeftToRight: - - - - 528 - - - - makeTextWritingDirectionRightToLeft: - - - - 529 - - - - performFindPanelAction: - - - - 533 - - - - addFontTrait: - - - - 420 - - - - addFontTrait: - - - - 421 - - - - modifyFont: - - - - 422 - - - - orderFrontFontPanel: - - - - 423 - - - - modifyFont: - - - - 424 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - - - - - 19 - - - - - - - - 56 - - - - - - - - 217 - - - - - - - - 83 - - - - - - - - 81 - - - - - - - - - - - - - - 75 - - - - - 72 - - - - - 82 - - - - - 124 - - - - - - - - 73 - - - - - 79 - - - - - 112 - - - - - 125 - - - - - - - - 126 - - - - - 205 - - - - - - - - - - - - - - - - - - - - - - 202 - - - - - 198 - - - - - 207 - - - - - 214 - - - - - 199 - - - - - 203 - - - - - 197 - - - - - 206 - - - - - 215 - - - - - 218 - - - - - - - - 216 - - - - - - - - 200 - - - - - - - - - - - - - 219 - - - - - 201 - - - - - 204 - - - - - 220 - - - - - - - - - - - - - 213 - - - - - 210 - - - - - 221 - - - - - 208 - - - - - 209 - - - - - 57 - - - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - - - - - - 296 - - - - - - - - - 297 - - - - - 298 - - - - - 211 - - - - - - - - 212 - - - - - - - - - 195 - - - - - 196 - - - - - 346 - - - - - 348 - - - - - - - - 349 - - - - - - - - - - - - - - 350 - - - - - 351 - - - - - 354 - - - - - 374 - - - - - - - - 375 - - - - - - - - - 376 - - - - - - - - 387 - - - - - - - - - - - - - - - - - - - - - - - 388 - - - - - 389 - - - - - 390 - - - - - 391 - - - - - 392 - - - - - 393 - - - - - 394 - - - - - 395 - - - - - 396 - - - - - - - - 397 - - - - - - - - 398 - - - - - - - - 399 - - - - - 400 - - - - - 401 - - - - - 402 - - - - - 403 - - - - - 404 - - - - - - - - - - - - 405 - - - - - 406 - - - - - 407 - - - - - 408 - - - - - 409 - - - - - 410 - - - - - - - - - - 411 - - - - - 412 - - - - - 413 - - - - - 414 - - - - - - - - - - - 415 - - - - - 416 - - - - - 417 - - - - - 418 - - - - - 419 - - - - - 449 - - - - - - - - 450 - - - - - - - - - - 451 - - - - - 452 - - - - - 453 - - - - - 457 - - - - - 458 - - - - - 459 - - - - - 462 - - - - - 464 - - - - - 465 - - - - - 470 - - - - - 491 - - - - - - - - 492 - - - - - - - - 493 - - - - - 495 - - - - - - - - 496 - - - - - - - - - - - - - - - - - 497 - - - - - 498 - - - - - 499 - - - - - 500 - - - - - 501 - - - - - 502 - - - - - - - - 503 - - - - - 504 - - - - - 505 - - - - - 506 - - - - - 507 - - - - - - - - - - - - - - - - 508 - - - - - 509 - - - - - 510 - - - - - 511 - - - - - 512 - - - - - 513 - - - - - 514 - - - - - 515 - - - - - 516 - - - - - 532 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 533 - - - - - FirstResponder - - duplicateDocument: - id - - - duplicateDocument: - - duplicateDocument: - id - - - - IBUserSource - - - - - NSDocument - - id - id - id - id - id - id - - - - printDocument: - id - - - revertDocumentToSaved: - id - - - runPageLayout: - id - - - saveDocument: - id - - - saveDocumentAs: - id - - - saveDocumentTo: - id - - - - IBProjectSource - ./Classes/NSDocument.h - - - - - 0 - IBCocoaFramework - YES - 3 - - {11, 11} - {10, 3} - - - diff --git a/KRWorldBuilder/KRWorldBuilder/main.m b/KRWorldBuilder/KRWorldBuilder/main.m deleted file mode 100644 index 50a784d..0000000 --- a/KRWorldBuilder/KRWorldBuilder/main.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// main.m -// KRWorldBuilder -// -// Created by Kearwood Gilbert on 12-02-10. -// Copyright (c) 2012 Kearwood Software. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) -{ - return NSApplicationMain(argc, (const char **)argv); -} diff --git a/KREngine/Kraken.xcodeproj/project.pbxproj b/Kraken.xcodeproj/project.pbxproj similarity index 100% rename from KREngine/Kraken.xcodeproj/project.pbxproj rename to Kraken.xcodeproj/project.pbxproj diff --git a/KREngine/Kraken.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Kraken.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from KREngine/Kraken.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Kraken.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/KREngine/kraken/KRAABB.cpp b/kraken/KRAABB.cpp similarity index 100% rename from KREngine/kraken/KRAABB.cpp rename to kraken/KRAABB.cpp diff --git a/KREngine/kraken/KRAABB.h b/kraken/KRAABB.h similarity index 100% rename from KREngine/kraken/KRAABB.h rename to kraken/KRAABB.h diff --git a/KREngine/kraken/KRAmbientZone.cpp b/kraken/KRAmbientZone.cpp similarity index 100% rename from KREngine/kraken/KRAmbientZone.cpp rename to kraken/KRAmbientZone.cpp diff --git a/KREngine/kraken/KRAmbientZone.h b/kraken/KRAmbientZone.h similarity index 100% rename from KREngine/kraken/KRAmbientZone.h rename to kraken/KRAmbientZone.h diff --git a/KREngine/kraken/KRAnimation.cpp b/kraken/KRAnimation.cpp similarity index 100% rename from KREngine/kraken/KRAnimation.cpp rename to kraken/KRAnimation.cpp diff --git a/KREngine/kraken/KRAnimation.h b/kraken/KRAnimation.h similarity index 100% rename from KREngine/kraken/KRAnimation.h rename to kraken/KRAnimation.h diff --git a/KREngine/kraken/KRAnimationAttribute.cpp b/kraken/KRAnimationAttribute.cpp similarity index 100% rename from KREngine/kraken/KRAnimationAttribute.cpp rename to kraken/KRAnimationAttribute.cpp diff --git a/KREngine/kraken/KRAnimationAttribute.h b/kraken/KRAnimationAttribute.h similarity index 100% rename from KREngine/kraken/KRAnimationAttribute.h rename to kraken/KRAnimationAttribute.h diff --git a/KREngine/kraken/KRAnimationCurve.cpp b/kraken/KRAnimationCurve.cpp similarity index 100% rename from KREngine/kraken/KRAnimationCurve.cpp rename to kraken/KRAnimationCurve.cpp diff --git a/KREngine/kraken/KRAnimationCurve.h b/kraken/KRAnimationCurve.h similarity index 100% rename from KREngine/kraken/KRAnimationCurve.h rename to kraken/KRAnimationCurve.h diff --git a/KREngine/kraken/KRAnimationCurveManager.cpp b/kraken/KRAnimationCurveManager.cpp similarity index 100% rename from KREngine/kraken/KRAnimationCurveManager.cpp rename to kraken/KRAnimationCurveManager.cpp diff --git a/KREngine/kraken/KRAnimationCurveManager.h b/kraken/KRAnimationCurveManager.h similarity index 100% rename from KREngine/kraken/KRAnimationCurveManager.h rename to kraken/KRAnimationCurveManager.h diff --git a/KREngine/kraken/KRAnimationLayer.cpp b/kraken/KRAnimationLayer.cpp similarity index 100% rename from KREngine/kraken/KRAnimationLayer.cpp rename to kraken/KRAnimationLayer.cpp diff --git a/KREngine/kraken/KRAnimationLayer.h b/kraken/KRAnimationLayer.h similarity index 100% rename from KREngine/kraken/KRAnimationLayer.h rename to kraken/KRAnimationLayer.h diff --git a/KREngine/kraken/KRAnimationManager.cpp b/kraken/KRAnimationManager.cpp similarity index 100% rename from KREngine/kraken/KRAnimationManager.cpp rename to kraken/KRAnimationManager.cpp diff --git a/KREngine/kraken/KRAnimationManager.h b/kraken/KRAnimationManager.h similarity index 100% rename from KREngine/kraken/KRAnimationManager.h rename to kraken/KRAnimationManager.h diff --git a/KREngine/kraken/KRAudioBuffer.cpp b/kraken/KRAudioBuffer.cpp similarity index 100% rename from KREngine/kraken/KRAudioBuffer.cpp rename to kraken/KRAudioBuffer.cpp diff --git a/KREngine/kraken/KRAudioBuffer.h b/kraken/KRAudioBuffer.h similarity index 100% rename from KREngine/kraken/KRAudioBuffer.h rename to kraken/KRAudioBuffer.h diff --git a/KREngine/kraken/KRAudioManager.cpp b/kraken/KRAudioManager.cpp similarity index 100% rename from KREngine/kraken/KRAudioManager.cpp rename to kraken/KRAudioManager.cpp diff --git a/KREngine/kraken/KRAudioManager.h b/kraken/KRAudioManager.h similarity index 100% rename from KREngine/kraken/KRAudioManager.h rename to kraken/KRAudioManager.h diff --git a/KREngine/kraken/KRAudioSample.cpp b/kraken/KRAudioSample.cpp similarity index 100% rename from KREngine/kraken/KRAudioSample.cpp rename to kraken/KRAudioSample.cpp diff --git a/KREngine/kraken/KRAudioSample.h b/kraken/KRAudioSample.h similarity index 100% rename from KREngine/kraken/KRAudioSample.h rename to kraken/KRAudioSample.h diff --git a/KREngine/kraken/KRAudioSource.cpp b/kraken/KRAudioSource.cpp similarity index 100% rename from KREngine/kraken/KRAudioSource.cpp rename to kraken/KRAudioSource.cpp diff --git a/KREngine/kraken/KRAudioSource.h b/kraken/KRAudioSource.h similarity index 100% rename from KREngine/kraken/KRAudioSource.h rename to kraken/KRAudioSource.h diff --git a/KREngine/kraken/KRBehavior.cpp b/kraken/KRBehavior.cpp similarity index 100% rename from KREngine/kraken/KRBehavior.cpp rename to kraken/KRBehavior.cpp diff --git a/KREngine/kraken/KRBehavior.h b/kraken/KRBehavior.h similarity index 100% rename from KREngine/kraken/KRBehavior.h rename to kraken/KRBehavior.h diff --git a/KREngine/kraken/KRBone.cpp b/kraken/KRBone.cpp similarity index 100% rename from KREngine/kraken/KRBone.cpp rename to kraken/KRBone.cpp diff --git a/KREngine/kraken/KRBone.h b/kraken/KRBone.h similarity index 100% rename from KREngine/kraken/KRBone.h rename to kraken/KRBone.h diff --git a/KREngine/kraken/KRBundle.cpp b/kraken/KRBundle.cpp similarity index 100% rename from KREngine/kraken/KRBundle.cpp rename to kraken/KRBundle.cpp diff --git a/KREngine/kraken/KRBundle.h b/kraken/KRBundle.h similarity index 100% rename from KREngine/kraken/KRBundle.h rename to kraken/KRBundle.h diff --git a/KREngine/kraken/KRBundleManager.cpp b/kraken/KRBundleManager.cpp similarity index 100% rename from KREngine/kraken/KRBundleManager.cpp rename to kraken/KRBundleManager.cpp diff --git a/KREngine/kraken/KRBundleManager.h b/kraken/KRBundleManager.h similarity index 100% rename from KREngine/kraken/KRBundleManager.h rename to kraken/KRBundleManager.h diff --git a/KREngine/kraken/KRCamera.cpp b/kraken/KRCamera.cpp similarity index 100% rename from KREngine/kraken/KRCamera.cpp rename to kraken/KRCamera.cpp diff --git a/KREngine/kraken/KRCamera.h b/kraken/KRCamera.h similarity index 100% rename from KREngine/kraken/KRCamera.h rename to kraken/KRCamera.h diff --git a/KREngine/kraken/KRCollider.cpp b/kraken/KRCollider.cpp similarity index 100% rename from KREngine/kraken/KRCollider.cpp rename to kraken/KRCollider.cpp diff --git a/KREngine/kraken/KRCollider.h b/kraken/KRCollider.h similarity index 100% rename from KREngine/kraken/KRCollider.h rename to kraken/KRCollider.h diff --git a/KREngine/kraken/KRContext.cpp b/kraken/KRContext.cpp similarity index 100% rename from KREngine/kraken/KRContext.cpp rename to kraken/KRContext.cpp diff --git a/KREngine/kraken/KRContext.h b/kraken/KRContext.h similarity index 100% rename from KREngine/kraken/KRContext.h rename to kraken/KRContext.h diff --git a/KREngine/kraken/KRContextObject.cpp b/kraken/KRContextObject.cpp similarity index 100% rename from KREngine/kraken/KRContextObject.cpp rename to kraken/KRContextObject.cpp diff --git a/KREngine/kraken/KRContextObject.h b/kraken/KRContextObject.h similarity index 100% rename from KREngine/kraken/KRContextObject.h rename to kraken/KRContextObject.h diff --git a/KREngine/kraken/KRDataBlock.cpp b/kraken/KRDataBlock.cpp similarity index 100% rename from KREngine/kraken/KRDataBlock.cpp rename to kraken/KRDataBlock.cpp diff --git a/KREngine/kraken/KRDataBlock.h b/kraken/KRDataBlock.h similarity index 100% rename from KREngine/kraken/KRDataBlock.h rename to kraken/KRDataBlock.h diff --git a/KREngine/kraken/KRDirectionalLight.cpp b/kraken/KRDirectionalLight.cpp similarity index 100% rename from KREngine/kraken/KRDirectionalLight.cpp rename to kraken/KRDirectionalLight.cpp diff --git a/KREngine/kraken/KRDirectionalLight.h b/kraken/KRDirectionalLight.h similarity index 100% rename from KREngine/kraken/KRDirectionalLight.h rename to kraken/KRDirectionalLight.h diff --git a/KREngine/kraken/KREngine-common.h b/kraken/KREngine-common.h similarity index 100% rename from KREngine/kraken/KREngine-common.h rename to kraken/KREngine-common.h diff --git a/KREngine/kraken/KREngine.h b/kraken/KREngine.h similarity index 100% rename from KREngine/kraken/KREngine.h rename to kraken/KREngine.h diff --git a/KREngine/kraken/KREngine.mm b/kraken/KREngine.mm similarity index 100% rename from KREngine/kraken/KREngine.mm rename to kraken/KREngine.mm diff --git a/KREngine/kraken/KRFloat.cpp b/kraken/KRFloat.cpp similarity index 100% rename from KREngine/kraken/KRFloat.cpp rename to kraken/KRFloat.cpp diff --git a/KREngine/kraken/KRFloat.h b/kraken/KRFloat.h similarity index 100% rename from KREngine/kraken/KRFloat.h rename to kraken/KRFloat.h diff --git a/KREngine/kraken/KRHitInfo.cpp b/kraken/KRHitInfo.cpp similarity index 100% rename from KREngine/kraken/KRHitInfo.cpp rename to kraken/KRHitInfo.cpp diff --git a/KREngine/kraken/KRHitInfo.h b/kraken/KRHitInfo.h similarity index 100% rename from KREngine/kraken/KRHitInfo.h rename to kraken/KRHitInfo.h diff --git a/KREngine/kraken/KRLODGroup.cpp b/kraken/KRLODGroup.cpp similarity index 100% rename from KREngine/kraken/KRLODGroup.cpp rename to kraken/KRLODGroup.cpp diff --git a/KREngine/kraken/KRLODGroup.h b/kraken/KRLODGroup.h similarity index 100% rename from KREngine/kraken/KRLODGroup.h rename to kraken/KRLODGroup.h diff --git a/KREngine/kraken/KRLODSet.cpp b/kraken/KRLODSet.cpp similarity index 100% rename from KREngine/kraken/KRLODSet.cpp rename to kraken/KRLODSet.cpp diff --git a/KREngine/kraken/KRLODSet.h b/kraken/KRLODSet.h similarity index 100% rename from KREngine/kraken/KRLODSet.h rename to kraken/KRLODSet.h diff --git a/KREngine/kraken/KRLight.cpp b/kraken/KRLight.cpp similarity index 100% rename from KREngine/kraken/KRLight.cpp rename to kraken/KRLight.cpp diff --git a/KREngine/kraken/KRLight.h b/kraken/KRLight.h similarity index 100% rename from KREngine/kraken/KRLight.h rename to kraken/KRLight.h diff --git a/KREngine/kraken/KRLocator.cpp b/kraken/KRLocator.cpp similarity index 100% rename from KREngine/kraken/KRLocator.cpp rename to kraken/KRLocator.cpp diff --git a/KREngine/kraken/KRLocator.h b/kraken/KRLocator.h similarity index 100% rename from KREngine/kraken/KRLocator.h rename to kraken/KRLocator.h diff --git a/KREngine/kraken/KRMat4.cpp b/kraken/KRMat4.cpp similarity index 100% rename from KREngine/kraken/KRMat4.cpp rename to kraken/KRMat4.cpp diff --git a/KREngine/kraken/KRMat4.h b/kraken/KRMat4.h similarity index 100% rename from KREngine/kraken/KRMat4.h rename to kraken/KRMat4.h diff --git a/KREngine/kraken/KRMaterial.cpp b/kraken/KRMaterial.cpp similarity index 100% rename from KREngine/kraken/KRMaterial.cpp rename to kraken/KRMaterial.cpp diff --git a/KREngine/kraken/KRMaterial.h b/kraken/KRMaterial.h similarity index 100% rename from KREngine/kraken/KRMaterial.h rename to kraken/KRMaterial.h diff --git a/KREngine/kraken/KRMaterialManager.cpp b/kraken/KRMaterialManager.cpp similarity index 100% rename from KREngine/kraken/KRMaterialManager.cpp rename to kraken/KRMaterialManager.cpp diff --git a/KREngine/kraken/KRMaterialManager.h b/kraken/KRMaterialManager.h similarity index 100% rename from KREngine/kraken/KRMaterialManager.h rename to kraken/KRMaterialManager.h diff --git a/KREngine/kraken/KRMesh.cpp b/kraken/KRMesh.cpp similarity index 100% rename from KREngine/kraken/KRMesh.cpp rename to kraken/KRMesh.cpp diff --git a/KREngine/kraken/KRMesh.h b/kraken/KRMesh.h similarity index 100% rename from KREngine/kraken/KRMesh.h rename to kraken/KRMesh.h diff --git a/KREngine/kraken/KRMeshCube.cpp b/kraken/KRMeshCube.cpp similarity index 100% rename from KREngine/kraken/KRMeshCube.cpp rename to kraken/KRMeshCube.cpp diff --git a/KREngine/kraken/KRMeshCube.h b/kraken/KRMeshCube.h similarity index 100% rename from KREngine/kraken/KRMeshCube.h rename to kraken/KRMeshCube.h diff --git a/KREngine/kraken/KRMeshManager.cpp b/kraken/KRMeshManager.cpp similarity index 100% rename from KREngine/kraken/KRMeshManager.cpp rename to kraken/KRMeshManager.cpp diff --git a/KREngine/kraken/KRMeshManager.h b/kraken/KRMeshManager.h similarity index 100% rename from KREngine/kraken/KRMeshManager.h rename to kraken/KRMeshManager.h diff --git a/KREngine/kraken/KRMeshQuad.cpp b/kraken/KRMeshQuad.cpp similarity index 100% rename from KREngine/kraken/KRMeshQuad.cpp rename to kraken/KRMeshQuad.cpp diff --git a/KREngine/kraken/KRMeshQuad.h b/kraken/KRMeshQuad.h similarity index 100% rename from KREngine/kraken/KRMeshQuad.h rename to kraken/KRMeshQuad.h diff --git a/KREngine/kraken/KRMeshSphere.cpp b/kraken/KRMeshSphere.cpp similarity index 100% rename from KREngine/kraken/KRMeshSphere.cpp rename to kraken/KRMeshSphere.cpp diff --git a/KREngine/kraken/KRMeshSphere.h b/kraken/KRMeshSphere.h similarity index 100% rename from KREngine/kraken/KRMeshSphere.h rename to kraken/KRMeshSphere.h diff --git a/KREngine/kraken/KRMeshStreamer.mm b/kraken/KRMeshStreamer.mm similarity index 100% rename from KREngine/kraken/KRMeshStreamer.mm rename to kraken/KRMeshStreamer.mm diff --git a/KREngine/kraken/KRModel.cpp b/kraken/KRModel.cpp similarity index 100% rename from KREngine/kraken/KRModel.cpp rename to kraken/KRModel.cpp diff --git a/KREngine/kraken/KRModel.h b/kraken/KRModel.h similarity index 100% rename from KREngine/kraken/KRModel.h rename to kraken/KRModel.h diff --git a/KREngine/kraken/KRNode.cpp b/kraken/KRNode.cpp similarity index 100% rename from KREngine/kraken/KRNode.cpp rename to kraken/KRNode.cpp diff --git a/KREngine/kraken/KRNode.h b/kraken/KRNode.h similarity index 100% rename from KREngine/kraken/KRNode.h rename to kraken/KRNode.h diff --git a/KREngine/kraken/KROctree.cpp b/kraken/KROctree.cpp similarity index 100% rename from KREngine/kraken/KROctree.cpp rename to kraken/KROctree.cpp diff --git a/KREngine/kraken/KROctree.h b/kraken/KROctree.h similarity index 100% rename from KREngine/kraken/KROctree.h rename to kraken/KROctree.h diff --git a/KREngine/kraken/KROctreeNode.cpp b/kraken/KROctreeNode.cpp similarity index 100% rename from KREngine/kraken/KROctreeNode.cpp rename to kraken/KROctreeNode.cpp diff --git a/KREngine/kraken/KROctreeNode.h b/kraken/KROctreeNode.h similarity index 100% rename from KREngine/kraken/KROctreeNode.h rename to kraken/KROctreeNode.h diff --git a/KREngine/kraken/KRParticleSystem.cpp b/kraken/KRParticleSystem.cpp similarity index 100% rename from KREngine/kraken/KRParticleSystem.cpp rename to kraken/KRParticleSystem.cpp diff --git a/KREngine/kraken/KRParticleSystem.h b/kraken/KRParticleSystem.h similarity index 100% rename from KREngine/kraken/KRParticleSystem.h rename to kraken/KRParticleSystem.h diff --git a/KREngine/kraken/KRParticleSystemNewtonian.cpp b/kraken/KRParticleSystemNewtonian.cpp similarity index 100% rename from KREngine/kraken/KRParticleSystemNewtonian.cpp rename to kraken/KRParticleSystemNewtonian.cpp diff --git a/KREngine/kraken/KRParticleSystemNewtonian.h b/kraken/KRParticleSystemNewtonian.h similarity index 100% rename from KREngine/kraken/KRParticleSystemNewtonian.h rename to kraken/KRParticleSystemNewtonian.h diff --git a/KREngine/kraken/KRPointLight.cpp b/kraken/KRPointLight.cpp similarity index 100% rename from KREngine/kraken/KRPointLight.cpp rename to kraken/KRPointLight.cpp diff --git a/KREngine/kraken/KRPointLight.h b/kraken/KRPointLight.h similarity index 100% rename from KREngine/kraken/KRPointLight.h rename to kraken/KRPointLight.h diff --git a/KREngine/kraken/KRQuaternion.cpp b/kraken/KRQuaternion.cpp similarity index 100% rename from KREngine/kraken/KRQuaternion.cpp rename to kraken/KRQuaternion.cpp diff --git a/KREngine/kraken/KRQuaternion.h b/kraken/KRQuaternion.h similarity index 100% rename from KREngine/kraken/KRQuaternion.h rename to kraken/KRQuaternion.h diff --git a/KREngine/kraken/KRRenderSettings.cpp b/kraken/KRRenderSettings.cpp similarity index 100% rename from KREngine/kraken/KRRenderSettings.cpp rename to kraken/KRRenderSettings.cpp diff --git a/KREngine/kraken/KRRenderSettings.h b/kraken/KRRenderSettings.h similarity index 100% rename from KREngine/kraken/KRRenderSettings.h rename to kraken/KRRenderSettings.h diff --git a/KREngine/kraken/KRResource+blend.cpp b/kraken/KRResource+blend.cpp similarity index 100% rename from KREngine/kraken/KRResource+blend.cpp rename to kraken/KRResource+blend.cpp diff --git a/KREngine/kraken/KRResource+blend.h b/kraken/KRResource+blend.h similarity index 100% rename from KREngine/kraken/KRResource+blend.h rename to kraken/KRResource+blend.h diff --git a/KREngine/kraken/KRResource+fbx.cpp b/kraken/KRResource+fbx.cpp similarity index 100% rename from KREngine/kraken/KRResource+fbx.cpp rename to kraken/KRResource+fbx.cpp diff --git a/KREngine/kraken/KRResource+obj.cpp b/kraken/KRResource+obj.cpp similarity index 100% rename from KREngine/kraken/KRResource+obj.cpp rename to kraken/KRResource+obj.cpp diff --git a/KREngine/kraken/KRResource.cpp b/kraken/KRResource.cpp similarity index 100% rename from KREngine/kraken/KRResource.cpp rename to kraken/KRResource.cpp diff --git a/KREngine/kraken/KRResource.h b/kraken/KRResource.h similarity index 100% rename from KREngine/kraken/KRResource.h rename to kraken/KRResource.h diff --git a/KREngine/kraken/KRReverbZone.cpp b/kraken/KRReverbZone.cpp similarity index 100% rename from KREngine/kraken/KRReverbZone.cpp rename to kraken/KRReverbZone.cpp diff --git a/KREngine/kraken/KRReverbZone.h b/kraken/KRReverbZone.h similarity index 100% rename from KREngine/kraken/KRReverbZone.h rename to kraken/KRReverbZone.h diff --git a/KREngine/kraken/KRScene.cpp b/kraken/KRScene.cpp similarity index 100% rename from KREngine/kraken/KRScene.cpp rename to kraken/KRScene.cpp diff --git a/KREngine/kraken/KRScene.h b/kraken/KRScene.h similarity index 100% rename from KREngine/kraken/KRScene.h rename to kraken/KRScene.h diff --git a/KREngine/kraken/KRSceneManager.cpp b/kraken/KRSceneManager.cpp similarity index 100% rename from KREngine/kraken/KRSceneManager.cpp rename to kraken/KRSceneManager.cpp diff --git a/KREngine/kraken/KRSceneManager.h b/kraken/KRSceneManager.h similarity index 100% rename from KREngine/kraken/KRSceneManager.h rename to kraken/KRSceneManager.h diff --git a/KREngine/kraken/KRShader.cpp b/kraken/KRShader.cpp similarity index 100% rename from KREngine/kraken/KRShader.cpp rename to kraken/KRShader.cpp diff --git a/KREngine/kraken/KRShader.h b/kraken/KRShader.h similarity index 100% rename from KREngine/kraken/KRShader.h rename to kraken/KRShader.h diff --git a/KREngine/kraken/KRShaderManager.cpp b/kraken/KRShaderManager.cpp similarity index 100% rename from KREngine/kraken/KRShaderManager.cpp rename to kraken/KRShaderManager.cpp diff --git a/KREngine/kraken/KRShaderManager.h b/kraken/KRShaderManager.h similarity index 100% rename from KREngine/kraken/KRShaderManager.h rename to kraken/KRShaderManager.h diff --git a/KREngine/kraken/KRSpotLight.cpp b/kraken/KRSpotLight.cpp similarity index 100% rename from KREngine/kraken/KRSpotLight.cpp rename to kraken/KRSpotLight.cpp diff --git a/KREngine/kraken/KRSpotLight.h b/kraken/KRSpotLight.h similarity index 100% rename from KREngine/kraken/KRSpotLight.h rename to kraken/KRSpotLight.h diff --git a/KREngine/kraken/KRSprite.cpp b/kraken/KRSprite.cpp similarity index 100% rename from KREngine/kraken/KRSprite.cpp rename to kraken/KRSprite.cpp diff --git a/KREngine/kraken/KRSprite.h b/kraken/KRSprite.h similarity index 100% rename from KREngine/kraken/KRSprite.h rename to kraken/KRSprite.h diff --git a/KREngine/kraken/KRStockGeometry.h b/kraken/KRStockGeometry.h similarity index 100% rename from KREngine/kraken/KRStockGeometry.h rename to kraken/KRStockGeometry.h diff --git a/KREngine/kraken/KRStreamer.h b/kraken/KRStreamer.h similarity index 100% rename from KREngine/kraken/KRStreamer.h rename to kraken/KRStreamer.h diff --git a/KREngine/kraken/KRStreamer.mm b/kraken/KRStreamer.mm similarity index 100% rename from KREngine/kraken/KRStreamer.mm rename to kraken/KRStreamer.mm diff --git a/KREngine/kraken/KRTexture.cpp b/kraken/KRTexture.cpp similarity index 100% rename from KREngine/kraken/KRTexture.cpp rename to kraken/KRTexture.cpp diff --git a/KREngine/kraken/KRTexture.h b/kraken/KRTexture.h similarity index 100% rename from KREngine/kraken/KRTexture.h rename to kraken/KRTexture.h diff --git a/KREngine/kraken/KRTexture2D.cpp b/kraken/KRTexture2D.cpp similarity index 100% rename from KREngine/kraken/KRTexture2D.cpp rename to kraken/KRTexture2D.cpp diff --git a/KREngine/kraken/KRTexture2D.h b/kraken/KRTexture2D.h similarity index 100% rename from KREngine/kraken/KRTexture2D.h rename to kraken/KRTexture2D.h diff --git a/KREngine/kraken/KRTextureAnimated.cpp b/kraken/KRTextureAnimated.cpp similarity index 100% rename from KREngine/kraken/KRTextureAnimated.cpp rename to kraken/KRTextureAnimated.cpp diff --git a/KREngine/kraken/KRTextureAnimated.h b/kraken/KRTextureAnimated.h similarity index 100% rename from KREngine/kraken/KRTextureAnimated.h rename to kraken/KRTextureAnimated.h diff --git a/KREngine/kraken/KRTextureCube.cpp b/kraken/KRTextureCube.cpp similarity index 100% rename from KREngine/kraken/KRTextureCube.cpp rename to kraken/KRTextureCube.cpp diff --git a/KREngine/kraken/KRTextureCube.h b/kraken/KRTextureCube.h similarity index 100% rename from KREngine/kraken/KRTextureCube.h rename to kraken/KRTextureCube.h diff --git a/KREngine/kraken/KRTextureKTX.cpp b/kraken/KRTextureKTX.cpp similarity index 100% rename from KREngine/kraken/KRTextureKTX.cpp rename to kraken/KRTextureKTX.cpp diff --git a/KREngine/kraken/KRTextureKTX.h b/kraken/KRTextureKTX.h similarity index 100% rename from KREngine/kraken/KRTextureKTX.h rename to kraken/KRTextureKTX.h diff --git a/KREngine/kraken/KRTextureManager.cpp b/kraken/KRTextureManager.cpp similarity index 100% rename from KREngine/kraken/KRTextureManager.cpp rename to kraken/KRTextureManager.cpp diff --git a/KREngine/kraken/KRTextureManager.h b/kraken/KRTextureManager.h similarity index 100% rename from KREngine/kraken/KRTextureManager.h rename to kraken/KRTextureManager.h diff --git a/KREngine/kraken/KRTexturePVR.cpp b/kraken/KRTexturePVR.cpp similarity index 100% rename from KREngine/kraken/KRTexturePVR.cpp rename to kraken/KRTexturePVR.cpp diff --git a/KREngine/kraken/KRTexturePVR.h b/kraken/KRTexturePVR.h similarity index 100% rename from KREngine/kraken/KRTexturePVR.h rename to kraken/KRTexturePVR.h diff --git a/KREngine/kraken/KRTextureStreamer.mm b/kraken/KRTextureStreamer.mm similarity index 100% rename from KREngine/kraken/KRTextureStreamer.mm rename to kraken/KRTextureStreamer.mm diff --git a/KREngine/kraken/KRTextureTGA.cpp b/kraken/KRTextureTGA.cpp similarity index 100% rename from KREngine/kraken/KRTextureTGA.cpp rename to kraken/KRTextureTGA.cpp diff --git a/KREngine/kraken/KRTextureTGA.h b/kraken/KRTextureTGA.h similarity index 100% rename from KREngine/kraken/KRTextureTGA.h rename to kraken/KRTextureTGA.h diff --git a/KREngine/kraken/KRTriangle3.cpp b/kraken/KRTriangle3.cpp similarity index 100% rename from KREngine/kraken/KRTriangle3.cpp rename to kraken/KRTriangle3.cpp diff --git a/KREngine/kraken/KRTriangle3.h b/kraken/KRTriangle3.h similarity index 100% rename from KREngine/kraken/KRTriangle3.h rename to kraken/KRTriangle3.h diff --git a/KREngine/kraken/KRUnknown.cpp b/kraken/KRUnknown.cpp similarity index 100% rename from KREngine/kraken/KRUnknown.cpp rename to kraken/KRUnknown.cpp diff --git a/KREngine/kraken/KRUnknown.h b/kraken/KRUnknown.h similarity index 100% rename from KREngine/kraken/KRUnknown.h rename to kraken/KRUnknown.h diff --git a/KREngine/kraken/KRUnknownManager.cpp b/kraken/KRUnknownManager.cpp similarity index 100% rename from KREngine/kraken/KRUnknownManager.cpp rename to kraken/KRUnknownManager.cpp diff --git a/KREngine/kraken/KRUnknownManager.h b/kraken/KRUnknownManager.h similarity index 100% rename from KREngine/kraken/KRUnknownManager.h rename to kraken/KRUnknownManager.h diff --git a/KREngine/kraken/KRVector2.cpp b/kraken/KRVector2.cpp similarity index 100% rename from KREngine/kraken/KRVector2.cpp rename to kraken/KRVector2.cpp diff --git a/KREngine/kraken/KRVector2.h b/kraken/KRVector2.h similarity index 100% rename from KREngine/kraken/KRVector2.h rename to kraken/KRVector2.h diff --git a/KREngine/kraken/KRVector3.cpp b/kraken/KRVector3.cpp similarity index 100% rename from KREngine/kraken/KRVector3.cpp rename to kraken/KRVector3.cpp diff --git a/KREngine/kraken/KRVector3.h b/kraken/KRVector3.h similarity index 100% rename from KREngine/kraken/KRVector3.h rename to kraken/KRVector3.h diff --git a/KREngine/kraken/KRVector4.cpp b/kraken/KRVector4.cpp similarity index 100% rename from KREngine/kraken/KRVector4.cpp rename to kraken/KRVector4.cpp diff --git a/KREngine/kraken/KRVector4.h b/kraken/KRVector4.h similarity index 100% rename from KREngine/kraken/KRVector4.h rename to kraken/KRVector4.h diff --git a/KREngine/kraken/KRViewport.cpp b/kraken/KRViewport.cpp similarity index 100% rename from KREngine/kraken/KRViewport.cpp rename to kraken/KRViewport.cpp diff --git a/KREngine/kraken/KRViewport.h b/kraken/KRViewport.h similarity index 100% rename from KREngine/kraken/KRViewport.h rename to kraken/KRViewport.h diff --git a/KREngine/kraken_ios/Kraken-Prefix.pch b/kraken_ios/Kraken-Prefix.pch similarity index 100% rename from KREngine/kraken_ios/Kraken-Prefix.pch rename to kraken_ios/Kraken-Prefix.pch diff --git a/KREngine/kraken_osx/Kraken-Info.plist b/kraken_osx/Kraken-Info.plist similarity index 100% rename from KREngine/kraken_osx/Kraken-Info.plist rename to kraken_osx/Kraken-Info.plist diff --git a/KREngine/kraken_osx/en.lproj/InfoPlist.strings b/kraken_osx/en.lproj/InfoPlist.strings similarity index 100% rename from KREngine/kraken_osx/en.lproj/InfoPlist.strings rename to kraken_osx/en.lproj/InfoPlist.strings diff --git a/KREngine/kraken_osx/kraken-prefix.pch b/kraken_osx/kraken-prefix.pch similarity index 100% rename from KREngine/kraken_osx/kraken-prefix.pch rename to kraken_osx/kraken-prefix.pch diff --git a/KREngine/kraken_osx/krengine_osx.h b/kraken_osx/krengine_osx.h similarity index 100% rename from KREngine/kraken_osx/krengine_osx.h rename to kraken_osx/krengine_osx.h diff --git a/KREngine/kraken_osx/krengine_osx.mm b/kraken_osx/krengine_osx.mm similarity index 100% rename from KREngine/kraken_osx/krengine_osx.mm rename to kraken_osx/krengine_osx.mm diff --git a/KREngine/kraken_standard_assets/hrtf_kemar.krbundle b/kraken_standard_assets/hrtf_kemar.krbundle similarity index 100% rename from KREngine/kraken_standard_assets/hrtf_kemar.krbundle rename to kraken_standard_assets/hrtf_kemar.krbundle diff --git a/KREngine/kraken_standard_assets_ios/Resources-Info.plist b/kraken_standard_assets_ios/Resources-Info.plist similarity index 100% rename from KREngine/kraken_standard_assets_ios/Resources-Info.plist rename to kraken_standard_assets_ios/Resources-Info.plist diff --git a/KREngine/kraken_standard_assets_ios/Shaders/ObjectShader.fsh b/kraken_standard_assets_ios/Shaders/ObjectShader.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/ObjectShader.fsh rename to kraken_standard_assets_ios/Shaders/ObjectShader.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/ObjectShader.vsh b/kraken_standard_assets_ios/Shaders/ObjectShader.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/ObjectShader.vsh rename to kraken_standard_assets_ios/Shaders/ObjectShader.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/PostShader.fsh b/kraken_standard_assets_ios/Shaders/PostShader.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/PostShader.fsh rename to kraken_standard_assets_ios/Shaders/PostShader.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/PostShader.vsh b/kraken_standard_assets_ios/Shaders/PostShader.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/PostShader.vsh rename to kraken_standard_assets_ios/Shaders/PostShader.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/ShadowShader.fsh b/kraken_standard_assets_ios/Shaders/ShadowShader.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/ShadowShader.fsh rename to kraken_standard_assets_ios/Shaders/ShadowShader.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/ShadowShader.vsh b/kraken_standard_assets_ios/Shaders/ShadowShader.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/ShadowShader.vsh rename to kraken_standard_assets_ios/Shaders/ShadowShader.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/debug_font.fsh b/kraken_standard_assets_ios/Shaders/debug_font.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/debug_font.fsh rename to kraken_standard_assets_ios/Shaders/debug_font.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/debug_font.vsh b/kraken_standard_assets_ios/Shaders/debug_font.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/debug_font.vsh rename to kraken_standard_assets_ios/Shaders/debug_font.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/dust_particle.fsh b/kraken_standard_assets_ios/Shaders/dust_particle.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/dust_particle.fsh rename to kraken_standard_assets_ios/Shaders/dust_particle.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/dust_particle.vsh b/kraken_standard_assets_ios/Shaders/dust_particle.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/dust_particle.vsh rename to kraken_standard_assets_ios/Shaders/dust_particle.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/flare.fsh b/kraken_standard_assets_ios/Shaders/flare.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/flare.fsh rename to kraken_standard_assets_ios/Shaders/flare.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/flare.vsh b/kraken_standard_assets_ios/Shaders/flare.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/flare.vsh rename to kraken_standard_assets_ios/Shaders/flare.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/light_directional.fsh b/kraken_standard_assets_ios/Shaders/light_directional.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/light_directional.fsh rename to kraken_standard_assets_ios/Shaders/light_directional.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/light_directional.vsh b/kraken_standard_assets_ios/Shaders/light_directional.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/light_directional.vsh rename to kraken_standard_assets_ios/Shaders/light_directional.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/light_point.fsh b/kraken_standard_assets_ios/Shaders/light_point.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/light_point.fsh rename to kraken_standard_assets_ios/Shaders/light_point.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/light_point.vsh b/kraken_standard_assets_ios/Shaders/light_point.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/light_point.vsh rename to kraken_standard_assets_ios/Shaders/light_point.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/light_point_inside.fsh b/kraken_standard_assets_ios/Shaders/light_point_inside.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/light_point_inside.fsh rename to kraken_standard_assets_ios/Shaders/light_point_inside.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/light_point_inside.vsh b/kraken_standard_assets_ios/Shaders/light_point_inside.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/light_point_inside.vsh rename to kraken_standard_assets_ios/Shaders/light_point_inside.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/occlusion_test.fsh b/kraken_standard_assets_ios/Shaders/occlusion_test.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/occlusion_test.fsh rename to kraken_standard_assets_ios/Shaders/occlusion_test.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/occlusion_test.vsh b/kraken_standard_assets_ios/Shaders/occlusion_test.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/occlusion_test.vsh rename to kraken_standard_assets_ios/Shaders/occlusion_test.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/simple_blit.fsh b/kraken_standard_assets_ios/Shaders/simple_blit.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/simple_blit.fsh rename to kraken_standard_assets_ios/Shaders/simple_blit.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/simple_blit.vsh b/kraken_standard_assets_ios/Shaders/simple_blit.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/simple_blit.vsh rename to kraken_standard_assets_ios/Shaders/simple_blit.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/sky_box.fsh b/kraken_standard_assets_ios/Shaders/sky_box.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/sky_box.fsh rename to kraken_standard_assets_ios/Shaders/sky_box.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/sky_box.vsh b/kraken_standard_assets_ios/Shaders/sky_box.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/sky_box.vsh rename to kraken_standard_assets_ios/Shaders/sky_box.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/sprite.fsh b/kraken_standard_assets_ios/Shaders/sprite.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/sprite.fsh rename to kraken_standard_assets_ios/Shaders/sprite.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/sprite.vsh b/kraken_standard_assets_ios/Shaders/sprite.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/sprite.vsh rename to kraken_standard_assets_ios/Shaders/sprite.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/visualize_overlay.fsh b/kraken_standard_assets_ios/Shaders/visualize_overlay.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/visualize_overlay.fsh rename to kraken_standard_assets_ios/Shaders/visualize_overlay.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/visualize_overlay.vsh b/kraken_standard_assets_ios/Shaders/visualize_overlay.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/visualize_overlay.vsh rename to kraken_standard_assets_ios/Shaders/visualize_overlay.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog.fsh b/kraken_standard_assets_ios/Shaders/volumetric_fog.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog.fsh rename to kraken_standard_assets_ios/Shaders/volumetric_fog.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog.vsh b/kraken_standard_assets_ios/Shaders/volumetric_fog.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog.vsh rename to kraken_standard_assets_ios/Shaders/volumetric_fog.vsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.fsh b/kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.fsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.fsh rename to kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.fsh diff --git a/KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.vsh b/kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.vsh similarity index 100% rename from KREngine/kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.vsh rename to kraken_standard_assets_ios/Shaders/volumetric_fog_downsampled.vsh diff --git a/KREngine/kraken_standard_assets_ios/font.pvr b/kraken_standard_assets_ios/font.pvr similarity index 100% rename from KREngine/kraken_standard_assets_ios/font.pvr rename to kraken_standard_assets_ios/font.pvr diff --git a/KREngine/kraken_standard_assets_osx/Resources-Info.plist b/kraken_standard_assets_osx/Resources-Info.plist similarity index 100% rename from KREngine/kraken_standard_assets_osx/Resources-Info.plist rename to kraken_standard_assets_osx/Resources-Info.plist diff --git a/KREngine/kraken_standard_assets_osx/Shaders/ObjectShader_osx.fsh b/kraken_standard_assets_osx/Shaders/ObjectShader_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/ObjectShader_osx.fsh rename to kraken_standard_assets_osx/Shaders/ObjectShader_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/ObjectShader_osx.vsh b/kraken_standard_assets_osx/Shaders/ObjectShader_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/ObjectShader_osx.vsh rename to kraken_standard_assets_osx/Shaders/ObjectShader_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/PostShader_osx.fsh b/kraken_standard_assets_osx/Shaders/PostShader_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/PostShader_osx.fsh rename to kraken_standard_assets_osx/Shaders/PostShader_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/PostShader_osx.vsh b/kraken_standard_assets_osx/Shaders/PostShader_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/PostShader_osx.vsh rename to kraken_standard_assets_osx/Shaders/PostShader_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/ShadowShader_osx.fsh b/kraken_standard_assets_osx/Shaders/ShadowShader_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/ShadowShader_osx.fsh rename to kraken_standard_assets_osx/Shaders/ShadowShader_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/ShadowShader_osx.vsh b/kraken_standard_assets_osx/Shaders/ShadowShader_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/ShadowShader_osx.vsh rename to kraken_standard_assets_osx/Shaders/ShadowShader_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/debug_font_osx.fsh b/kraken_standard_assets_osx/Shaders/debug_font_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/debug_font_osx.fsh rename to kraken_standard_assets_osx/Shaders/debug_font_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/debug_font_osx.vsh b/kraken_standard_assets_osx/Shaders/debug_font_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/debug_font_osx.vsh rename to kraken_standard_assets_osx/Shaders/debug_font_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/dust_particle_osx.fsh b/kraken_standard_assets_osx/Shaders/dust_particle_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/dust_particle_osx.fsh rename to kraken_standard_assets_osx/Shaders/dust_particle_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/dust_particle_osx.vsh b/kraken_standard_assets_osx/Shaders/dust_particle_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/dust_particle_osx.vsh rename to kraken_standard_assets_osx/Shaders/dust_particle_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/flare_osx.fsh b/kraken_standard_assets_osx/Shaders/flare_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/flare_osx.fsh rename to kraken_standard_assets_osx/Shaders/flare_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/flare_osx.vsh b/kraken_standard_assets_osx/Shaders/flare_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/flare_osx.vsh rename to kraken_standard_assets_osx/Shaders/flare_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/light_directional_osx.fsh b/kraken_standard_assets_osx/Shaders/light_directional_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/light_directional_osx.fsh rename to kraken_standard_assets_osx/Shaders/light_directional_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/light_directional_osx.vsh b/kraken_standard_assets_osx/Shaders/light_directional_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/light_directional_osx.vsh rename to kraken_standard_assets_osx/Shaders/light_directional_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/light_point_inside_osx.fsh b/kraken_standard_assets_osx/Shaders/light_point_inside_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/light_point_inside_osx.fsh rename to kraken_standard_assets_osx/Shaders/light_point_inside_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/light_point_inside_osx.vsh b/kraken_standard_assets_osx/Shaders/light_point_inside_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/light_point_inside_osx.vsh rename to kraken_standard_assets_osx/Shaders/light_point_inside_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/light_point_osx.fsh b/kraken_standard_assets_osx/Shaders/light_point_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/light_point_osx.fsh rename to kraken_standard_assets_osx/Shaders/light_point_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/light_point_osx.vsh b/kraken_standard_assets_osx/Shaders/light_point_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/light_point_osx.vsh rename to kraken_standard_assets_osx/Shaders/light_point_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/occlusion_test_osx.fsh b/kraken_standard_assets_osx/Shaders/occlusion_test_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/occlusion_test_osx.fsh rename to kraken_standard_assets_osx/Shaders/occlusion_test_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/occlusion_test_osx.vsh b/kraken_standard_assets_osx/Shaders/occlusion_test_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/occlusion_test_osx.vsh rename to kraken_standard_assets_osx/Shaders/occlusion_test_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/simple_blit_osx.fsh b/kraken_standard_assets_osx/Shaders/simple_blit_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/simple_blit_osx.fsh rename to kraken_standard_assets_osx/Shaders/simple_blit_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/simple_blit_osx.vsh b/kraken_standard_assets_osx/Shaders/simple_blit_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/simple_blit_osx.vsh rename to kraken_standard_assets_osx/Shaders/simple_blit_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/sky_box_osx.fsh b/kraken_standard_assets_osx/Shaders/sky_box_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/sky_box_osx.fsh rename to kraken_standard_assets_osx/Shaders/sky_box_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/sky_box_osx.vsh b/kraken_standard_assets_osx/Shaders/sky_box_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/sky_box_osx.vsh rename to kraken_standard_assets_osx/Shaders/sky_box_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/sprite_osx.fsh b/kraken_standard_assets_osx/Shaders/sprite_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/sprite_osx.fsh rename to kraken_standard_assets_osx/Shaders/sprite_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/sprite_osx.vsh b/kraken_standard_assets_osx/Shaders/sprite_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/sprite_osx.vsh rename to kraken_standard_assets_osx/Shaders/sprite_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/visualize_overlay_osx.fsh b/kraken_standard_assets_osx/Shaders/visualize_overlay_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/visualize_overlay_osx.fsh rename to kraken_standard_assets_osx/Shaders/visualize_overlay_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/visualize_overlay_osx.vsh b/kraken_standard_assets_osx/Shaders/visualize_overlay_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/visualize_overlay_osx.vsh rename to kraken_standard_assets_osx/Shaders/visualize_overlay_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.fsh b/kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.fsh rename to kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.vsh b/kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.vsh rename to kraken_standard_assets_osx/Shaders/volumetric_fog_downsampled_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_osx.fsh b/kraken_standard_assets_osx/Shaders/volumetric_fog_osx.fsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_osx.fsh rename to kraken_standard_assets_osx/Shaders/volumetric_fog_osx.fsh diff --git a/KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_osx.vsh b/kraken_standard_assets_osx/Shaders/volumetric_fog_osx.vsh similarity index 100% rename from KREngine/kraken_standard_assets_osx/Shaders/volumetric_fog_osx.vsh rename to kraken_standard_assets_osx/Shaders/volumetric_fog_osx.vsh diff --git a/KREngine/kraken_standard_assets_osx/font.tga b/kraken_standard_assets_osx/font.tga similarity index 100% rename from KREngine/kraken_standard_assets_osx/font.tga rename to kraken_standard_assets_osx/font.tga diff --git a/krengine.xcworkspace/contents.xcworkspacedata b/krengine.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1529ac9..0000000 --- a/krengine.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - diff --git a/objpack/objpack.xcodeproj/project.pbxproj b/objpack/objpack.xcodeproj/project.pbxproj deleted file mode 100644 index b7bac37..0000000 --- a/objpack/objpack.xcodeproj/project.pbxproj +++ /dev/null @@ -1,233 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - E404C89D136B8E2F00B6C99B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E404C89C136B8E2F00B6C99B /* main.cpp */; }; - E404C8A6136B901400B6C99B /* KROBJPacker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E404C8A4136B901400B6C99B /* KROBJPacker.cpp */; }; - E4BBBBA11512A51200F43B5B /* krengine_osx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBBA01512A51200F43B5B /* krengine_osx.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - E404C896136B8E2F00B6C99B /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - E404C898136B8E2F00B6C99B /* objpack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = objpack; sourceTree = BUILT_PRODUCTS_DIR; }; - E404C89C136B8E2F00B6C99B /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = main.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - E404C89E136B8E2F00B6C99B /* objpack.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = objpack.1; sourceTree = ""; }; - E404C8A4136B901400B6C99B /* KROBJPacker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = KROBJPacker.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - E404C8A5136B901400B6C99B /* KROBJPacker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KROBJPacker.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - E4BBBBA01512A51200F43B5B /* krengine_osx.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = krengine_osx.framework; path = ../KREngine/build/Release/krengine_osx.framework; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - E404C895136B8E2F00B6C99B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E4BBBBA11512A51200F43B5B /* krengine_osx.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - E404C88D136B8E2F00B6C99B = { - isa = PBXGroup; - children = ( - E404C89B136B8E2F00B6C99B /* objpack */, - E4BBBBA51512A59E00F43B5B /* Frameworks */, - E404C899136B8E2F00B6C99B /* Products */, - ); - sourceTree = ""; - }; - E404C899136B8E2F00B6C99B /* Products */ = { - isa = PBXGroup; - children = ( - E404C898136B8E2F00B6C99B /* objpack */, - ); - name = Products; - sourceTree = ""; - }; - E404C89B136B8E2F00B6C99B /* objpack */ = { - isa = PBXGroup; - children = ( - E404C89C136B8E2F00B6C99B /* main.cpp */, - E404C89E136B8E2F00B6C99B /* objpack.1 */, - E404C8A4136B901400B6C99B /* KROBJPacker.cpp */, - E404C8A5136B901400B6C99B /* KROBJPacker.h */, - ); - path = objpack; - sourceTree = ""; - }; - E4BBBBA51512A59E00F43B5B /* Frameworks */ = { - isa = PBXGroup; - children = ( - E4BBBBA01512A51200F43B5B /* krengine_osx.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - E404C897136B8E2F00B6C99B /* objpack */ = { - isa = PBXNativeTarget; - buildConfigurationList = E404C8A1136B8E3000B6C99B /* Build configuration list for PBXNativeTarget "objpack" */; - buildPhases = ( - E404C894136B8E2F00B6C99B /* Sources */, - E404C895136B8E2F00B6C99B /* Frameworks */, - E404C896136B8E2F00B6C99B /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = objpack; - productName = objpack; - productReference = E404C898136B8E2F00B6C99B /* objpack */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E404C88F136B8E2F00B6C99B /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0440; - ORGANIZATIONNAME = "Kearwood Software"; - }; - buildConfigurationList = E404C892136B8E2F00B6C99B /* Build configuration list for PBXProject "objpack" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = E404C88D136B8E2F00B6C99B; - productRefGroup = E404C899136B8E2F00B6C99B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - E404C897136B8E2F00B6C99B /* objpack */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - E404C894136B8E2F00B6C99B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E404C89D136B8E2F00B6C99B /* main.cpp in Sources */, - E404C8A6136B901400B6C99B /* KROBJPacker.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - E404C89F136B8E3000B6C99B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - E404C8A0136B8E3000B6C99B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx; - }; - name = Release; - }; - E404C8A2136B8E3000B6C99B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SYSTEM_APPS_DIR)/Autodesk/FBXSDK20122/lib/gcc4/ub\"", - "\"$(SYSTEM_APPS_DIR)/PVR SDK Package/Utilities/PVRTexLib/MacOS\"", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - E404C8A3136B8E3000B6C99B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SYSTEM_APPS_DIR)/Autodesk/FBXSDK20122/lib/gcc4/ub\"", - "\"$(SYSTEM_APPS_DIR)/PVR SDK Package/Utilities/PVRTexLib/MacOS\"", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - E404C892136B8E2F00B6C99B /* Build configuration list for PBXProject "objpack" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E404C89F136B8E3000B6C99B /* Debug */, - E404C8A0136B8E3000B6C99B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E404C8A1136B8E3000B6C99B /* Build configuration list for PBXNativeTarget "objpack" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E404C8A2136B8E3000B6C99B /* Debug */, - E404C8A3136B8E3000B6C99B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = E404C88F136B8E2F00B6C99B /* Project object */; -} diff --git a/objpack/objpack.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/objpack/objpack.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 6f68d8a..0000000 --- a/objpack/objpack.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/objpack/objpack/KROBJPacker.cpp b/objpack/objpack/KROBJPacker.cpp deleted file mode 100644 index 773fb40..0000000 --- a/objpack/objpack/KROBJPacker.cpp +++ /dev/null @@ -1,91 +0,0 @@ -// -// objpacker.cpp -// objpack -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import -#include -#include -#include -#include -#include -#include -#include -#include - -#include "KROBJPacker.h" -#import -#import -#import - -KROBJPacker::KROBJPacker() { - -} - -KROBJPacker::~KROBJPacker() { - -} - -void KROBJPacker::pack(const char *szPath) { - std::cout << "Reading " << szPath << " ...\n"; - std::string base_path = KRResource::GetFilePath(szPath); - - KRContext context = KRContext(); - - vector resources = KRResource::Load(context, szPath); - - try { - vector::iterator resource_itr = resources.begin(); - for(vector::iterator resource_itr = resources.begin(); resource_itr != resources.end(); resource_itr++) { - KRResource *pResource = (*resource_itr); - std::string out_file_name = base_path; - out_file_name.append("/output/"); - //out_file_name.append(pResource->GetFileBase(pResource->getName())); - out_file_name.append(pResource->getName()); - out_file_name.append("."); - out_file_name.append(pResource->getExtension()); - std::cout << "Writing " << out_file_name << " ... "; - if(pResource->save(out_file_name)) { - std::cout << " SUCCESS!\n"; - } else { - std::cout << " FAIL...\n"; - } - } - } catch(...) { - for(vector::iterator resource_itr = resources.begin(); resource_itr != resources.end(); resource_itr++) { - KRResource *pResource = (*resource_itr); - delete pResource; - } - throw; - } - for(vector::iterator resource_itr = resources.begin(); resource_itr != resources.end(); resource_itr++) { - KRResource *pResource = (*resource_itr); - delete pResource; - } -} diff --git a/objpack/objpack/KROBJPacker.h b/objpack/objpack/KROBJPacker.h deleted file mode 100644 index 328976c..0000000 --- a/objpack/objpack/KROBJPacker.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// objpacker.h -// objpack -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import -#import - -#ifndef OBJPACKER_H -#define OBJPACKER_H - - -class KROBJPacker { -public: - KROBJPacker(); - ~KROBJPacker(); - void pack(const char *szPath); - -}; - -#endif // OBJPACKER_H \ No newline at end of file diff --git a/objpack/objpack/main.cpp b/objpack/objpack/main.cpp deleted file mode 100644 index 62ac274..0000000 --- a/objpack/objpack/main.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// -// main.cpp -// objpack -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#include - -#import "KROBJPacker.h" - -int main (int argc, const char * argv[]) -{ - - if(argc < 2) { - std::cout << "You must pass an .obj file as a parameter. An .obj.pack file will be written for each .obj file.\n"; - } else { - KROBJPacker p; - for(int i=1; i < argc; i++) { - p.pack(argv[i]); - } - std::cout << "Done.\n"; - } - - return 0; -} - diff --git a/objpack/objpack/objpack.1 b/objpack/objpack/objpack.1 deleted file mode 100644 index ba9cc29..0000000 --- a/objpack/objpack/objpack.1 +++ /dev/null @@ -1,79 +0,0 @@ -.\"Modified from man(1) of FreeBSD, the NetBSD mdoc.template, and mdoc.samples. -.\"See Also: -.\"man mdoc.samples for a complete listing of options -.\"man mdoc for the short list of editing options -.\"/usr/share/misc/mdoc.template -.Dd 11-04-29 \" DATE -.Dt objpack 1 \" Program name and manual section number -.Os Darwin -.Sh NAME \" Section Header - required - don't modify -.Nm objpack, -.\" The following lines are read in generating the apropos(man -k) database. Use only key -.\" words here as the database is built based on the words here and in the .ND line. -.Nm Other_name_for_same_program(), -.Nm Yet another name for the same program. -.\" Use .Nm macro to designate other names for the documented program. -.Nd This line parsed for whatis database. -.Sh SYNOPSIS \" Section Header - required - don't modify -.Nm -.Op Fl abcd \" [-abcd] -.Op Fl a Ar path \" [-a path] -.Op Ar file \" [file] -.Op Ar \" [file ...] -.Ar arg0 \" Underlined argument - use .Ar anywhere to underline -arg2 ... \" Arguments -.Sh DESCRIPTION \" Section Header - required - don't modify -Use the .Nm macro to refer to your program throughout the man page like such: -.Nm -Underlining is accomplished with the .Ar macro like this: -.Ar underlined text . -.Pp \" Inserts a space -A list of items with descriptions: -.Bl -tag -width -indent \" Begins a tagged list -.It item a \" Each item preceded by .It macro -Description of item a -.It item b -Description of item b -.El \" Ends the list -.Pp -A list of flags and their descriptions: -.Bl -tag -width -indent \" Differs from above in tag removed -.It Fl a \"-a flag as a list item -Description of -a flag -.It Fl b -Description of -b flag -.El \" Ends the list -.Pp -.\" .Sh ENVIRONMENT \" May not be needed -.\" .Bl -tag -width "ENV_VAR_1" -indent \" ENV_VAR_1 is width of the string ENV_VAR_1 -.\" .It Ev ENV_VAR_1 -.\" Description of ENV_VAR_1 -.\" .It Ev ENV_VAR_2 -.\" Description of ENV_VAR_2 -.\" .El -.Sh FILES \" File used or created by the topic of the man page -.Bl -tag -width "/Users/joeuser/Library/really_long_file_name" -compact -.It Pa /usr/share/file_name -FILE_1 description -.It Pa /Users/joeuser/Library/really_long_file_name -FILE_2 description -.El \" Ends the list -.\" .Sh DIAGNOSTICS \" May not be needed -.\" .Bl -diag -.\" .It Diagnostic Tag -.\" Diagnostic informtion here. -.\" .It Diagnostic Tag -.\" Diagnostic informtion here. -.\" .El -.Sh SEE ALSO -.\" List links in ascending order by section, alphabetically within a section. -.\" Please do not reference files that do not exist without filing a bug report -.Xr a 1 , -.Xr b 1 , -.Xr c 1 , -.Xr a 2 , -.Xr b 2 , -.Xr a 3 , -.Xr b 3 -.\" .Sh BUGS \" Document known, unremedied bugs -.\" .Sh HISTORY \" Document history if command behaves in a unique manner \ No newline at end of file diff --git a/objview/Assets/Storyboard.storyboard b/objview/Assets/Storyboard.storyboard deleted file mode 100644 index 46fabf8..0000000 --- a/objview/Assets/Storyboard.storyboard +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/objview/Classes/KRObjViewAppDelegate.h b/objview/Classes/KRObjViewAppDelegate.h deleted file mode 100644 index 1202d2d..0000000 --- a/objview/Classes/KRObjViewAppDelegate.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// KRObjViewAppDelegate.h -// KRObjView -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import - -@class KRObjViewViewController; - -@interface KRObjViewAppDelegate : NSObject { - UIWindow *window; - KRObjViewViewController *viewController; -} - -@property (nonatomic, retain) IBOutlet UIWindow *window; -@property (nonatomic, retain) IBOutlet KRObjViewViewController *viewController; - -@end diff --git a/objview/Classes/KRObjViewAppDelegate.mm b/objview/Classes/KRObjViewAppDelegate.mm deleted file mode 100644 index 828d284..0000000 --- a/objview/Classes/KRObjViewAppDelegate.mm +++ /dev/null @@ -1,59 +0,0 @@ -// -// KRObjViewAppDelegate.m -// KRObjView -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import -#import "KRObjViewAppDelegate.h" -#import "KRObjViewViewController.h" - -@implementation KRObjViewAppDelegate - -@synthesize window; -@synthesize viewController; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - // Add the view controller's view to the window and display. -// [[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationFade]; -// [self.window addSubview:viewController.view]; -// [self.window makeKeyAndVisible]; - - //[TestFlight takeOff:@"bee30f66de8a537484b210b6ac8fa118_NDA5MTIyMDExLTExLTE0IDE1OjUxOjQwLjA0MzM4MA"]; - - return YES; -} - -- (void)dealloc { - [viewController release]; - [window release]; - [super dealloc]; -} - -@end diff --git a/objview/Classes/KRObjViewGLView.h b/objview/Classes/KRObjViewGLView.h deleted file mode 100644 index 6e73ff8..0000000 --- a/objview/Classes/KRObjViewGLView.h +++ /dev/null @@ -1,63 +0,0 @@ -// -// KRObjViewGLView.h -// KRObjView -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import - -#import -#import -#import - -@interface KRObjViewGLView : UIView { - - /* The pixel dimensions of the backbuffer */ - GLint backingWidth, backingHeight; - - - - /* OpenGL names for the renderbuffer and framebuffers used to render to this view */ - GLuint viewFramebuffer, viewRenderbuffer; -} - -@property (nonatomic, retain) EAGLContext *context; - -// OpenGL drawing -- (BOOL)createFramebuffers; -- (void)destroyFramebuffer; -- (void)setDisplayFramebuffer; -- (BOOL)presentFramebuffer; -- (BOOL)loadObjects; - -@property(nonatomic,retain) KREngine *engine; - -- (KRScene *)getScene; - - -@end diff --git a/objview/Classes/KRObjViewGLView.mm b/objview/Classes/KRObjViewGLView.mm deleted file mode 100644 index 3cead60..0000000 --- a/objview/Classes/KRObjViewGLView.mm +++ /dev/null @@ -1,206 +0,0 @@ -// -// KRObjViewGLView.m -// KRObjView -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import "KRObjViewGLView.h" - - -#import - -@implementation KRObjViewGLView - -// Override the class method to return the OpenGL layer, as opposed to the normal CALayer -+ (Class) layerClass -{ - return [CAEAGLLayer class]; -} - -- (id)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - - // Do OpenGL Core Animation layer setup - CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer; - - // Set scaling to account for Retina display - if ([self respondsToSelector:@selector(setContentScaleFactor:)]) - { - self.contentScaleFactor = [[UIScreen mainScreen] scale]; - } - - eaglLayer.opaque = YES; - eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking, kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil]; - _context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; - - if (!_context) - { - [self release]; - return nil; - } - - if (![EAGLContext setCurrentContext:_context]) - { - [self release]; - return nil; - } - - if (![self createFramebuffers]) - { - [self release]; - return nil; - } - - // Initialize KREngine - _engine = [[KREngine alloc] init]; - [self loadObjects]; - } - return self; -} - -- (void)dealloc { - [_engine release]; _engine = nil; - [_context release]; _context = nil; - - [super dealloc]; -} - -#pragma mark - -#pragma mark OpenGL drawing - -- (BOOL)loadObjects -{ - NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]; - NSFileManager* fileManager = [NSFileManager defaultManager]; - - - for (NSString* fileName in [fileManager contentsOfDirectoryAtPath: documentsDirectory error:nil]) { - NSString* path = [NSString stringWithFormat:@"%@/%@", documentsDirectory, fileName]; - [self.engine loadResource: path]; - } - - [self.engine setNearZ: 5.0]; - [self.engine setFarZ: 1000.0]; - //[renderEngine setNearZ: 1.0]; - //[renderEngine setFarZ: 3000.0]; - - - return TRUE; -} - -- (BOOL)createFramebuffers -{ - - // ===== Create onscreen framebuffer object ===== - GLDEBUG(glGenFramebuffers(1, &viewFramebuffer)); - GLDEBUG(glBindFramebuffer(GL_FRAMEBUFFER, viewFramebuffer)); - - // ----- Create color buffer for viewFramebuffer ----- - GLDEBUG(glGenRenderbuffers(1, &viewRenderbuffer)); - GLDEBUG(glBindRenderbuffer(GL_RENDERBUFFER, viewRenderbuffer)); - [_context renderbufferStorage:GL_RENDERBUFFER fromDrawable:(CAEAGLLayer*)self.layer]; - GLDEBUG(glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &backingWidth)); - GLDEBUG(glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &backingHeight)); - NSLog(@"Backing width: %d, height: %d", backingWidth, backingHeight); - GLDEBUG(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, viewRenderbuffer)); - - - - GLDEBUG( - if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { - NSLog(@"Failure with depth buffer generation"); - return NO; - } - ); - - GLDEBUG( - GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); - if (status != GL_FRAMEBUFFER_COMPLETE) { - NSLog(@"Incomplete FBO: %d", status); - exit(1); - } - ); - - return TRUE; -} - -- (void)destroyFramebuffer; -{ - if (viewFramebuffer) - { - GLDEBUG(glDeleteFramebuffers(1, &viewFramebuffer)); - viewFramebuffer = 0; - } - - if (viewRenderbuffer) - { - GLDEBUG(glDeleteRenderbuffers(1, &viewRenderbuffer)); - viewRenderbuffer = 0; - } -} - -- (void)setDisplayFramebuffer; -{ - if (_context) - { - if (!viewFramebuffer) - { - [self createFramebuffers]; - } - - //GLDEBUG(glBindFramebuffer(GL_FRAMEBUFFER, viewFramebuffer)); - - GLDEBUG(glViewport(0, 0, backingWidth, backingHeight)); - } -} - -- (BOOL)presentFramebuffer; -{ - BOOL success = FALSE; - - if (_context) - { - //GLDEBUG(glBindRenderbuffer(GL_RENDERBUFFER, viewRenderbuffer)); - - success = [_context presentRenderbuffer:GL_RENDERBUFFER]; - } - - return success; -} - -- (KRScene *)getScene -{ - return self.engine.context->getSceneManager()->getFirstScene(); -} - -#pragma mark - -#pragma mark Accessors - - -@end diff --git a/objview/Classes/KRObjViewViewController.h b/objview/Classes/KRObjViewViewController.h deleted file mode 100644 index 21a2876..0000000 --- a/objview/Classes/KRObjViewViewController.h +++ /dev/null @@ -1,76 +0,0 @@ -// -// KRObjViewViewController.h -// KRObjView -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import -#import "KRObjViewGLView.h" -#import -#import -#import - -@interface KRObjViewViewController : UIViewController { - - KRObjViewGLView *glView; - - float heading; - - KRVector3 camera_position; - double camera_pitch; - double camera_yaw; - - double leftStickStartX; - double leftStickStartY; - double rightStickStartX; - double rightStickStartY; - - double leftStickDeltaX; - double leftStickDeltaY; - double rightStickDeltaX; - double rightStickDeltaY; - double dLeftSlider; - double dRightSlider; - - bool bUpdateParam; - bool bLoadedTestInstances; - int cParamDisplayFrames; - - - id displayLink; - - CFTimeInterval _lastTime; - -} - -@property (readonly) KRObjViewGLView *glView; - -// OpenGL ES 2.0 setup methods -- (void)drawView:(id)sender; - -@end diff --git a/objview/Classes/KRObjViewViewController.mm b/objview/Classes/KRObjViewViewController.mm deleted file mode 100644 index 0775ffe..0000000 --- a/objview/Classes/KRObjViewViewController.mm +++ /dev/null @@ -1,279 +0,0 @@ -// -// KRObjViewViewController.m -// KRObjView -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import "KRObjViewViewController.h" -#import -#import -#import - - -@implementation KRObjViewViewController - -@synthesize glView; - -// Handle Touch Events -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - for(id touch in touches) { - CGPoint touchPoint = [touch locationInView:self.view]; - if(!leftStickStartY && !rightStickStartY && touchPoint.y < CGRectGetMinY(self.view.frame) + CGRectGetHeight(self.view.frame) * 0.05) { - dRightSlider = (touchPoint.x - CGRectGetMinX(self.view.frame)) / CGRectGetWidth(self.view.frame); - cParamDisplayFrames = 30; - bUpdateParam = true; - } else if(!leftStickStartY && !rightStickStartY && touchPoint.y > CGRectGetMinY(self.view.frame) + CGRectGetHeight(self.view.frame) * 0.95) { - dLeftSlider = (touchPoint.x - CGRectGetMinX(self.view.frame)) / CGRectGetWidth(self.view.frame); - cParamDisplayFrames = 30; - } else if(touchPoint.y > CGRectGetMidY(self.view.frame)) { - leftStickStartX = touchPoint.x; - leftStickStartY = touchPoint.y; - leftStickDeltaX = 0.0f; - leftStickDeltaY = 0.0f; - // NSLog(@"Left Stick Pressed"); - } else { - rightStickStartX = touchPoint.x; - rightStickStartY = touchPoint.y; - rightStickDeltaX = 0.0f; - rightStickDeltaY = 0.0f; - // NSLog(@"Right Stick Pressed"); - } - } - -} - -- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { - for(id touch in touches) { - CGPoint touchPoint = [touch locationInView:self.view]; - if(!leftStickStartY && !rightStickStartY && touchPoint.y < CGRectGetMinY(self.view.frame) + CGRectGetHeight(self.view.frame) * 0.10) { - dRightSlider = (touchPoint.x - CGRectGetMinX(self.view.frame)) / CGRectGetWidth(self.view.frame); - cParamDisplayFrames = 30; - bUpdateParam = true; - } else if(!leftStickStartY && !rightStickStartY && touchPoint.y > CGRectGetMinY(self.view.frame) + CGRectGetHeight(self.view.frame) * 0.90) { - dLeftSlider = (touchPoint.x - CGRectGetMinX(self.view.frame)) / CGRectGetWidth(self.view.frame); - cParamDisplayFrames = 30; - } else if(touchPoint.y > CGRectGetMidY(self.view.frame)) { - if(leftStickStartX > 0.0f) { // Avoid interpreting touches sliding across center of screen - leftStickDeltaX = (leftStickStartX - touchPoint.x) / (CGRectGetWidth(self.view.frame) * 0.25); - leftStickDeltaY = (leftStickStartY - touchPoint.y) / (CGRectGetHeight(self.view.frame) * 0.25); - // clamp values - if(leftStickDeltaX < -1.0f) { - leftStickDeltaX = -1.0f; - } else if(leftStickDeltaX > 1.0f) { - leftStickDeltaX = 1.0f; - } - if(leftStickDeltaY < -1.0f) { - leftStickDeltaY = -1.0f; - } else if(leftStickDeltaY > 1.0f) { - leftStickDeltaY = 1.0f; - } - } - } else { - if(rightStickStartX > 0.0f) { // Avoid interpreting touches sliding across center of screen - rightStickDeltaX = (rightStickStartX - touchPoint.x) / (CGRectGetWidth(self.view.frame) * 0.25); - rightStickDeltaY = (rightStickStartY - touchPoint.y) / (CGRectGetHeight(self.view.frame) * 0.25); - // clamp values - if(rightStickDeltaX < -1.0f) { - rightStickDeltaX = -1.0f; - } else if(rightStickDeltaX > 1.0f) { - rightStickDeltaX = 1.0f; - } - if(rightStickDeltaY < -1.0f) { - rightStickDeltaY = -1.0f; - } else if(rightStickDeltaY > 1.0f) { - rightStickDeltaY = 1.0f; - } - } - } - } -} - -- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { - for(id touch in touches) { - CGPoint touchPoint = [touch locationInView:self.view]; - if(touchPoint.y > CGRectGetMidY(self.view.frame)) { - leftStickStartX = 0.0f; - leftStickStartY = 0.0f; - leftStickDeltaX = 0.0f; - leftStickDeltaY = 0.0f; - } else { - rightStickStartX = 0.0f; - rightStickStartY = 0.0f; - rightStickDeltaX = 0.0f; - rightStickDeltaY = 0.0f; - } - } -} --(void)loadView { - - CGRect mainScreenFrame = [[UIScreen mainScreen] applicationFrame]; - UIView *primaryView = [[UIView alloc] initWithFrame:mainScreenFrame]; - self.view = primaryView; - [primaryView release]; - - glView = [[KRObjViewGLView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, mainScreenFrame.size.width, mainScreenFrame.size.height)]; - glView.multipleTouchEnabled = YES; - - [self.view addSubview:glView]; - [glView release]; - - camera_yaw = -4.0; - camera_pitch = 0.1; - - leftStickStartX = 0.0f; - leftStickStartY = 0.0f; - rightStickStartX = 0.0f; - rightStickStartY = 0.0f; - leftStickDeltaX = 0.0f; - leftStickDeltaY = 0.0f; - rightStickDeltaX = 0.0f; - rightStickDeltaY = 0.0f; - - - bUpdateParam = false; - dRightSlider = 0.0f; - dLeftSlider = 0.0f; - bLoadedTestInstances = false; - cParamDisplayFrames = 0; - - camera_position = KRVector3(-85, -1, -70); -} - -- (void)viewDidAppear:(BOOL)animated -{ - displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(drawView:)]; - [displayLink setFrameInterval:2]; // Maximum 30fps - [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; - _lastTime= [displayLink timestamp]; -} - -- (void)dealloc -{ - [displayLink invalidate]; - - [super dealloc]; -} - -- (void)drawView:(id)sender -{ - // @synchronized(self) { - if(glView.context && glView.engine) { - //glGetError(); // Clear any prior errors... - - - CFTimeInterval frame_start_time = CACurrentMediaTime(); - - //NSAutoreleasePool *framePool = [[NSAutoreleasePool alloc] init]; - - - CFTimeInterval time = [displayLink timestamp]; - float deltaTime = (time - _lastTime); - _lastTime = time; - - const GLfloat PI = 3.14159265; - const GLfloat d2r = PI * 2 / 360; - - - KREngine *engine = glView.engine; - int iParam = int(dLeftSlider * ([engine getParameterCount] + 1)); - if(iParam > [engine getParameterCount]) { - iParam = [engine getParameterCount]; - } - - - - if(cParamDisplayFrames && iParam < [engine getParameterCount]) { - cParamDisplayFrames--; - char szText[256]; - const char *szName = [[engine getParameterLabelWithIndex: iParam] UTF8String]; - double dValue = [engine getParameterValueWithIndex: iParam]; - switch([engine getParameterTypeWithIndex: iParam]) { - case KRENGINE_PARAMETER_INT: - sprintf(szText, "%s: %i", szName, (int)dValue); - break; - case KRENGINE_PARAMETER_BOOL: - sprintf(szText, "%s: %s", szName, dValue == 0.0 ? "false" : "true"); - break; - case KRENGINE_PARAMETER_FLOAT: - sprintf(szText, "%s: %f", szName, dValue); - break; - } - NSString *debug_text = [[NSString alloc] initWithUTF8String:szText]; - engine.debug_text = debug_text; - [debug_text release]; - } else { - engine.debug_text = @""; - } - - - - if(bUpdateParam) { - bUpdateParam = false; - - double dValue = dRightSlider * ([engine getParameterMaxWithIndex: iParam] - [engine getParameterMinWithIndex: iParam]) + [engine getParameterMinWithIndex: iParam]; - switch([engine getParameterTypeWithIndex: iParam]) { - case KRENGINE_PARAMETER_INT: - dValue = dRightSlider * ([engine getParameterMaxWithIndex: iParam] + 0.5 - [engine getParameterMinWithIndex: iParam]) + [engine getParameterMinWithIndex: iParam]; - [engine setParameterValueWithIndex: iParam Value: dValue]; - break; - case KRENGINE_PARAMETER_BOOL: - [engine setParameterValueWithIndex: iParam Value: 1.0 - dValue]; - break; - case KRENGINE_PARAMETER_FLOAT: - [engine setParameterValueWithIndex: iParam Value: dValue]; - break; - } - - } - - double dScaleFactor = 500.0f * deltaTime; - - camera_position.z += (-cos(camera_pitch) * cos(camera_yaw) * leftStickDeltaX + -cos(camera_pitch) * cos(camera_yaw - 90.0f * d2r) * -leftStickDeltaY) * dScaleFactor; - camera_position.x += (cos(camera_pitch) * sin(camera_yaw) * leftStickDeltaX + cos(camera_pitch) * sin(camera_yaw - 90.0f * d2r) * -leftStickDeltaY) * dScaleFactor; - camera_position.y += sin(camera_pitch) * leftStickDeltaX * dScaleFactor; - camera_yaw += rightStickDeltaY * 180.0 * d2r * deltaTime; - camera_pitch += rightStickDeltaX * 180.0 * d2r * deltaTime; - - - - assert([EAGLContext setCurrentContext:glView.context]); - [glView setDisplayFramebuffer]; - KRScene *scene = [glView getScene]; - [engine renderScene: scene WithPosition:camera_position Yaw: camera_yaw Pitch: camera_pitch Roll:0.0f]; - [glView presentFramebuffer]; - - //[framePool release]; - - double frameTime = CACurrentMediaTime() - frame_start_time; - - //NSLog(@"frameTime = %.1f ms (%.2f fps / %.2f fps) - %.2f%%", frameTime * 1000.0f, 1.0f / frameTime, 1.0f / deltaTime, frameTime / deltaTime * 100.0f); - } - //} -} - -@end diff --git a/objview/Classes/krengine/KREngine.h b/objview/Classes/krengine/KREngine.h deleted file mode 100644 index a7a3212..0000000 --- a/objview/Classes/krengine/KREngine.h +++ /dev/null @@ -1,67 +0,0 @@ -// -// KREngine.h -// gldemo -// -// Created by Kearwood Gilbert on 10-09-16. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#import -#import - -// #import "KRTextureManager.h" -#import -#import -#import "KRMat4.h" -#import "KRModel.h" -#import "KRTextureManager.h" -#import "KRMaterialManager.h" - -using std::map; - -@interface KREngine : NSObject -{ -@private - - GLint backingWidth, backingHeight; - - GLuint compositeFramebuffer, compositeDepthTexture, compositeColorTexture; - GLuint shadowFramebuffer, shadowDepthTexture; - - // uniform index - enum { - KRENGINE_UNIFORM_MATERIAL_AMBIENT, - KRENGINE_UNIFORM_MATERIAL_DIFFUSE, - KRENGINE_UNIFORM_MATERIAL_SPECULAR, - KRENGINE_UNIFORM_MVP, - KRENGINE_UNIFORM_MODEL, - KRENGINE_UNIFORM_MODELIT, // Inverse Transform - KRENGINE_NUM_UNIFORMS - }; - GLint m_uniforms[KRENGINE_NUM_UNIFORMS]; - - // attribute index - enum { - KRENGINE_ATTRIB_VERTEX, - KRENGINE_ATTRIB_NORMAL, - KRENGINE_ATTRIB_TANGENT, - KRENGINE_ATTRIB_TEXUV, - KRENGINE_NUM_ATTRIBUTES - }; - - - GLuint m_objectShaderProgram; - GLuint m_postShaderProgram; - GLuint m_shadowShaderProgram; - - std::map m_models; - KRTextureManager *m_pTextureManager; - KRMaterialManager *m_pMaterialManager; -} -- (id)initForWidth: (GLuint)width Height: (GLuint)height; -- (void)renderWithModelMatrix: (KRMat4)modelMatrix; -- (BOOL)loadVertexShader:(NSString *)vertexShaderName fragmentShader:(NSString *)fragmentShaderName forProgram:(GLuint *)programPointer; -- (BOOL)loadResource:(NSString *)path; - -@end - diff --git a/objview/Classes/krengine/KREngine.mm b/objview/Classes/krengine/KREngine.mm deleted file mode 100644 index 792a9a9..0000000 --- a/objview/Classes/krengine/KREngine.mm +++ /dev/null @@ -1,566 +0,0 @@ -// -// KREngine.mm -// gldemo -// -// Created by Kearwood Gilbert on 10-09-16. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#import "KREngine.h" - - - - -@interface KREngine (PrivateMethods) -//- (BOOL)loadObjects; -- (BOOL)loadShaders; -- (BOOL)createBuffers; -- (BOOL)compileShader:(GLuint *)shader type:(GLenum)type file:(NSString *)file; -- (BOOL)linkProgram:(GLuint)prog; -- (BOOL)validateProgram:(GLuint)prog; -- (void)renderPost; -- (BOOL)loadResource:(NSString *)path; -@end - -@implementation KREngine - -- (id)initForWidth: (GLuint)width Height: (GLuint)height -{ - backingWidth = width; - backingHeight = height; - - if ((self = [super init])) - { - - m_pTextureManager = new KRTextureManager(); - m_pMaterialManager = new KRMaterialManager(m_pTextureManager); - - if (![self createBuffers] || ![self loadShaders]/* || ![self loadObjects] */) - { - [self release]; - return nil; - } - } - - return self; -} - -- (BOOL)createBuffers -{ - // ===== Create offscreen compositing framebuffer object ===== - glGenFramebuffers(1, &compositeFramebuffer); - glBindFramebuffer(GL_FRAMEBUFFER, compositeFramebuffer); - - // ----- Create texture color buffer for compositeFramebuffer ----- - glGenTextures(1, &compositeColorTexture); - glBindTexture(GL_TEXTURE_2D, compositeColorTexture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); // This is necessary for non-power-of-two textures - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); // This is necessary for non-power-of-two textures - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, backingWidth, backingHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, compositeColorTexture, 0); - - // ----- Create Depth Texture for compositeFramebuffer ----- - glGenTextures(1, &compositeDepthTexture); - glBindTexture(GL_TEXTURE_2D, compositeDepthTexture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); // This is necessary for non-power-of-two textures - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); // This is necessary for non-power-of-two textures - glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, backingWidth, backingHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, compositeDepthTexture, 0); - - - - // ===== Create offscreen shadow framebuffer object ===== - glGenFramebuffers(1, &shadowFramebuffer); - glBindFramebuffer(GL_FRAMEBUFFER, shadowFramebuffer); - - // ----- Create Depth Texture for shadowFramebuffer ----- - glGenTextures(1, &shadowDepthTexture); - glBindTexture(GL_TEXTURE_2D, shadowDepthTexture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); // This is necessary for non-power-of-two textures - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); // This is necessary for non-power-of-two textures - glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, backingWidth, backingHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, shadowDepthTexture, 0); - - return TRUE; -} - -- (void)destroyBuffers -{ - if (compositeDepthTexture) { - glDeleteTextures(1, &compositeDepthTexture); - compositeDepthTexture = 0; - } - - if (compositeColorTexture) { - glDeleteTextures(1, &compositeColorTexture); - compositeColorTexture = 0; - } - - if (compositeFramebuffer) { - glDeleteFramebuffers(1, &compositeFramebuffer); - compositeFramebuffer = 0; - } - - if (shadowDepthTexture) { - glDeleteTextures(1, &shadowDepthTexture); - shadowDepthTexture = 0; - } - - if (shadowFramebuffer) { - glDeleteFramebuffers(1, &shadowFramebuffer); - shadowFramebuffer = 0; - } -} - -- (void)renderWithModelMatrix: (KRMat4)modelMatrix -{ - /* An identity matrix we use to perform the equivalant of glLoadIdentity */ - KRMat4 identitymatrix; - - KRMat4 projectionmatrix; /* Our projection matrix starts with all 0s */ - // KRMat4 modelmatrix; /* Our model matrix */ - KRMat4 mvpmatrix; /* Our MVP matrix */ - - - /* Create our projection matrix with a 45 degree field of view - * a width to height ratio of 1 and view from .1 to 800 infront of us */ - - projectionmatrix.perspective(45.0f, 1.3333, 0.01f, 800.0f); - - // Replace the implementation of this method to do your own custom drawing - static std::map::iterator model_itr; - - model_itr = m_models.begin(); - - - - glBindFramebuffer(GL_FRAMEBUFFER, compositeFramebuffer); - glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - - // Enable backface culling - glCullFace(GL_BACK); - glEnable(GL_CULL_FACE); - - // Enable z-buffer test - glEnable(GL_DEPTH_TEST); - glDepthFunc(GL_LEQUAL); - glDepthRangef(0.0, 1.0); - - // Enable alpha blending - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - - - - // Use shader program - glUseProgram(m_objectShaderProgram); - - // Sets the diffuseTexture variable to the first texture unit - glUniform1i(glGetUniformLocation(m_objectShaderProgram, "diffuseTexture"), 0); - - // Sets the specularTexture variable to the second texture unit - glUniform1i(glGetUniformLocation(m_objectShaderProgram, "specularTexture"), 1); - - // Sets the normalTexture variable to the third texture unit - glUniform1i(glGetUniformLocation(m_objectShaderProgram, "normalTexture"), 2); - - // Validate program before drawing. This is a good check, but only really necessary in a debug build. - // DEBUG macro must be defined in your debug configurations if that's not already the case. -#if defined(DEBUG) - if (![self validateProgram:m_objectShaderProgram]) - { - NSLog(@"Failed to validate program: %d", m_objectShaderProgram); - return; - } -#endif - - // ----- Render Model ----- - - KRMat4 modelmatrix = identitymatrix; - // Load the identity matrix into modelmatrix. rotate the model, and move it back 3 - KRModel *pModel = (*model_itr).second; - modelmatrix.translate(pModel->getMinX() - pModel->getMaxX(), pModel->getMinY() - pModel->getMaxY(), pModel->getMinZ() - pModel->getMaxZ()); - modelmatrix.scale(1.0/pModel-> getMaxDimension()); - modelmatrix.translate(0.15, 0.1, -0.4); - - - modelmatrix *= modelMatrix; - - mvpmatrix = modelmatrix; - - - - // multiply our modelmatrix and our projectionmatrix. - mvpmatrix *= projectionmatrix; - mvpmatrix.rotate(-90 * 0.0174532925199, Z_AXIS); - - - // Bind our modelmatrix variable to be a uniform called mvpmatrix in our shaderprogram - glUniformMatrix4fv(m_uniforms[KRENGINE_UNIFORM_MVP], 1, GL_FALSE, mvpmatrix.getPointer()); - glUniformMatrix4fv(m_uniforms[KRENGINE_UNIFORM_MODEL], 1, GL_FALSE, modelmatrix.getPointer()); - glUniformMatrix3fv(m_uniforms[KRENGINE_UNIFORM_MODELIT], 1, GL_FALSE, modelmatrix.getPointer()); - - - - (*model_itr).second -> render(m_objectShaderProgram, (GLuint)KRENGINE_ATTRIB_VERTEX, (GLuint)KRENGINE_ATTRIB_NORMAL, (GLuint)KRENGINE_ATTRIB_TANGENT, (GLuint)KRENGINE_ATTRIB_TEXUV, m_pMaterialManager); - - // This application only creates a single color renderbuffer which is already bound at this point. - // This call is redundant, but needed if dealing with multiple renderbuffers. - /* - glBindRenderbuffer(GL_RENDERBUFFER, colorRenderbuffer); - [context presentRenderbuffer:GL_RENDERBUFFER]; - */ - - [self renderPost]; -} - -- (BOOL)compileShader:(GLuint *)shader type:(GLenum)type file:(NSString *)file -{ - GLint status; - const GLchar *source; - - source = (GLchar *)[[NSString stringWithContentsOfFile:file encoding:NSUTF8StringEncoding error:nil] UTF8String]; - if (!source) - { - NSLog(@"Failed to load vertex shader"); - return FALSE; - } - - *shader = glCreateShader(type); - glShaderSource(*shader, 1, &source, NULL); - glCompileShader(*shader); - -#if defined(DEBUG) - GLint logLength; - glGetShaderiv(*shader, GL_INFO_LOG_LENGTH, &logLength); - if (logLength > 0) - { - GLchar *log = (GLchar *)malloc(logLength); - glGetShaderInfoLog(*shader, logLength, &logLength, log); - NSLog(@"Shader compile log:\n%s", log); - free(log); - } -#endif - - glGetShaderiv(*shader, GL_COMPILE_STATUS, &status); - if (status == 0) - { - glDeleteShader(*shader); - return FALSE; - } - - return TRUE; -} - -- (BOOL)linkProgram:(GLuint)prog -{ - GLint status; - - glLinkProgram(prog); - -#if defined(DEBUG) - GLint logLength; - glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &logLength); - if (logLength > 0) - { - GLchar *log = (GLchar *)malloc(logLength); - glGetProgramInfoLog(prog, logLength, &logLength, log); - NSLog(@"Program link log:\n%s", log); - free(log); - } -#endif - - glGetProgramiv(prog, GL_LINK_STATUS, &status); - if (status == 0) - return FALSE; - - return TRUE; -} - -- (BOOL)validateProgram:(GLuint)prog -{ - GLint logLength, status; - - glValidateProgram(prog); - glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &logLength); - if (logLength > 0) - { - GLchar *log = (GLchar *)malloc(logLength); - glGetProgramInfoLog(prog, logLength, &logLength, log); - NSLog(@"Program validate log:\n%s", log); - free(log); - } - - glGetProgramiv(prog, GL_VALIDATE_STATUS, &status); - if (status == 0) - return FALSE; - - return TRUE; -} - - -- (BOOL)loadVertexShader:(NSString *)vertexShaderName fragmentShader:(NSString *)fragmentShaderName forProgram:(GLuint *)programPointer; -{ - GLuint vertexShader, fragShader; - - NSString *vertShaderPathname, *fragShaderPathname; - - // Create shader program. - *programPointer = glCreateProgram(); - - // Create and compile vertex shader. - vertShaderPathname = [[NSBundle mainBundle] pathForResource:vertexShaderName ofType:@"vsh"]; - if (![self compileShader:&vertexShader type:GL_VERTEX_SHADER file:vertShaderPathname]) - { - NSLog(@"Failed to compile vertex shader"); - return FALSE; - } - - // Create and compile fragment shader. - fragShaderPathname = [[NSBundle mainBundle] pathForResource:fragmentShaderName ofType:@"fsh"]; - if (![self compileShader:&fragShader type:GL_FRAGMENT_SHADER file:fragShaderPathname]) - { - NSLog(@"Failed to compile fragment shader"); - return FALSE; - } - - // Attach vertex shader to program. - glAttachShader(*programPointer, vertexShader); - - // Attach fragment shader to program. - glAttachShader(*programPointer, fragShader); - - // Bind attribute locations. - // This needs to be done prior to linking. - glBindAttribLocation(*programPointer, KRENGINE_ATTRIB_VERTEX, "position"); - glBindAttribLocation(*programPointer, KRENGINE_ATTRIB_TEXUV, "inputTextureCoordinate"); - - - glBindAttribLocation(*programPointer, KRENGINE_ATTRIB_VERTEX, "myVertex"); - glBindAttribLocation(*programPointer, KRENGINE_ATTRIB_NORMAL, "myNormal"); - glBindAttribLocation(*programPointer, KRENGINE_ATTRIB_TANGENT, "myTangent"); - glBindAttribLocation(*programPointer, KRENGINE_ATTRIB_TEXUV, "myUV"); - - // Link program. - if (![self linkProgram:*programPointer]) - { - NSLog(@"Failed to link program: %d", *programPointer); - - if (vertexShader) - { - glDeleteShader(vertexShader); - vertexShader = 0; - } - if (fragShader) - { - glDeleteShader(fragShader); - fragShader = 0; - } - if (*programPointer) - { - glDeleteProgram(*programPointer); - *programPointer = 0; - } - - return FALSE; - } - - // Release vertex and fragment shaders. - if (vertexShader) - { - glDeleteShader(vertexShader); - } - if (fragShader) - { - glDeleteShader(fragShader); - } - - return TRUE; -} - -- (BOOL)loadShaders -{ - [self loadVertexShader:@"PostShader" fragmentShader:@"PostShader" forProgram:&m_postShaderProgram]; - [self loadVertexShader:@"ShadowShader" fragmentShader:@"ShadowShader" forProgram:&m_shadowShaderProgram]; - [self loadVertexShader:@"ObjectShader" fragmentShader:@"ObjectShader" forProgram:&m_objectShaderProgram]; - - // Get uniform locations - m_uniforms[KRENGINE_UNIFORM_MATERIAL_AMBIENT] = glGetUniformLocation(m_objectShaderProgram, "material_ambient"); - m_uniforms[KRENGINE_UNIFORM_MATERIAL_DIFFUSE] = glGetUniformLocation(m_objectShaderProgram, "material_diffuse"); - m_uniforms[KRENGINE_UNIFORM_MATERIAL_SPECULAR] = glGetUniformLocation(m_objectShaderProgram, "material_specular"); - m_uniforms[KRENGINE_UNIFORM_MVP] = glGetUniformLocation(m_objectShaderProgram, "myMVPMatrix"); - m_uniforms[KRENGINE_UNIFORM_MODEL] = glGetUniformLocation(m_objectShaderProgram, "myModelView"); - m_uniforms[KRENGINE_UNIFORM_MODELIT] = glGetUniformLocation(m_objectShaderProgram, "myModelViewIT"); - - return TRUE; -} - -- (BOOL)loadResource:(NSString *)path -{ - NSString *name = [[path lastPathComponent] stringByDeletingPathExtension]; - if([path hasSuffix: @".pack"]) { - NSLog(@"object: %@", path); - m_models[[name UTF8String]] = new KRModel([path UTF8String], m_pMaterialManager); - } else if([path hasSuffix: @".pvr"]) { - NSLog(@"texture: %@", path); - m_pTextureManager->loadTexture([name UTF8String], [path UTF8String]); - } else if([path hasSuffix: @".mtl"]) { - NSLog(@"material: %@", path); - m_pMaterialManager->loadFile([path UTF8String]); - } - - return TRUE; -} - -/* -- (BOOL)loadObjects -{ - NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]; - NSFileManager* fileManager = [NSFileManager defaultManager]; - - for (NSString* fileName in [fileManager contentsOfDirectoryAtPath: documentsDirectory error:nil]) { - if([fileName hasSuffix: @".pvr"]) { - NSString* path = [NSString stringWithFormat:@"%@/%@", documentsDirectory, fileName]; - [self loadResource: path]; - } - } - - for (NSString* fileName in [fileManager contentsOfDirectoryAtPath: documentsDirectory error:nil]) { - if([fileName hasSuffix: @".mtl"]) { - NSString* path = [NSString stringWithFormat:@"%@/%@", documentsDirectory, fileName]; - [self loadResource: path]; - } - } - - for (NSString* fileName in [fileManager contentsOfDirectoryAtPath: documentsDirectory error:nil]) { - if([fileName hasSuffix: @".pack"]) { - NSString* path = [NSString stringWithFormat:@"%@/%@", documentsDirectory, fileName]; - [self loadResource: path]; - } - } - - - - return TRUE; -} -*/ - -/* - NSArray *paths = [[NSBundle mainBundle] pathsForResourcesOfType:@"pack" inDirectory:nil]; - for (NSString *path in paths) { - [self loadResource: path]; - } - - NSArray *paths = [[NSBundle mainBundle] pathsForResourcesOfType:@"pvr" inDirectory:nil]; - for (NSString *path in paths) { - [self loadResource: path]; - } - - paths = [[NSBundle mainBundle] pathsForResourcesOfType:@"mtl" inDirectory:nil]; - for (NSString *path in paths) { - [self loadResource: path]; - } - */ - -- (void)dealloc -{ - if (m_objectShaderProgram) { - glDeleteProgram(m_objectShaderProgram); - m_objectShaderProgram = 0; - } - - for(std::map::iterator itr=m_models.begin(); itr != m_models.end(); itr++) { - delete (*itr).second; - } - m_models.empty(); - - if(m_pTextureManager) { - delete m_pTextureManager; - m_pTextureManager = NULL; - } - - if(m_pMaterialManager) { - delete m_pMaterialManager; - m_pMaterialManager = NULL; - } - - - [self destroyBuffers]; - [super dealloc]; -} - -- (void)renderPost -{ - glBindFramebuffer(GL_FRAMEBUFFER, 1); // renderFramebuffer - - // Replace the implementation of this method to do your own custom drawing. - static const GLfloat squareVertices[] = { - -1.0f, -1.0f, - 1.0f, -1.0f, - -1.0f, 1.0f, - 1.0f, 1.0f, - }; - - static const GLfloat textureVertices[] = { - 0.0f, 0.0f, - 1.0f, 0.0f, - 0.0f, 1.0f, - 1.0f, 1.0f, - }; - /* - static const GLfloat textureVertices[] = { - 1.0f, 1.0f, - 1.0f, 0.0f, - 0.0f, 1.0f, - 0.0f, 0.0f, - }; - */ - - - glDisable(GL_DEPTH_TEST); - glUseProgram(m_postShaderProgram); - - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, compositeDepthTexture); - glUniform1i(glGetUniformLocation(m_postShaderProgram, "depthFrame"), 0); - - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, compositeColorTexture); - glUniform1i(glGetUniformLocation(m_postShaderProgram, "renderFrame"), 1); - - /* - glActiveTexture(GL_TEXTURE2); - glBindTexture(GL_TEXTURE_2D, videoFrameTexture); - glUniform1i(glGetUniformLocation(m_postShaderProgram, "videoFrame"), 2); - */ - - // Update attribute values. - glVertexAttribPointer(KRENGINE_ATTRIB_VERTEX, 2, GL_FLOAT, 0, 0, squareVertices); - glEnableVertexAttribArray(KRENGINE_ATTRIB_VERTEX); - glVertexAttribPointer(KRENGINE_ATTRIB_TEXUV, 2, GL_FLOAT, 0, 0, textureVertices); - glEnableVertexAttribArray(KRENGINE_ATTRIB_TEXUV); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, 0); - - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, 0); - - /* - glActiveTexture(GL_TEXTURE2); - glBindTexture(GL_TEXTURE_2D, 0); - */ -} - -@end diff --git a/objview/Classes/krengine/KRMat4.cpp b/objview/Classes/krengine/KRMat4.cpp deleted file mode 100644 index 2b17a43..0000000 --- a/objview/Classes/krengine/KRMat4.cpp +++ /dev/null @@ -1,133 +0,0 @@ -// -// KRMat4.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-09-21. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#include -#include -#include - -#include "KRMat4.h" - -KRMat4::KRMat4() { - // Default constructor - Initialize with an identity matrix - static const GLfloat IDENTITY_MATRIX[] = { - 1.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0 - }; - memcpy(m_mat, IDENTITY_MATRIX, sizeof(GLfloat) * 16); - -} - -KRMat4::~KRMat4() { - -} - -GLfloat *KRMat4::getPointer() { - return m_mat; -} - -// Copy constructor -KRMat4::KRMat4(const KRMat4 &m) { - - memcpy(m_mat, m.m_mat, sizeof(GLfloat) * 16); -} - -KRMat4& KRMat4::operator=(const KRMat4 &m) { - if(this != &m) { // Prevent self-assignment. - memcpy(m_mat, m.m_mat, sizeof(GLfloat) * 16); - } - return *this; -} - -// Overload compound multiply operator -KRMat4& KRMat4::operator*=(const KRMat4 &m) { - GLfloat temp[16]; - - int x,y; - - for (x=0; x < 4; x++) - { - for(y=0; y < 4; y++) - { - temp[y + (x*4)] = (m_mat[x*4] * m.m_mat[y]) + - (m_mat[(x*4)+1] * m.m_mat[y+4]) + - (m_mat[(x*4)+2] * m.m_mat[y+8]) + - (m_mat[(x*4)+3] * m.m_mat[y+12]); - } - } - - memcpy(m_mat, temp, sizeof(GLfloat) << 4); - return *this; -} - -// Overload multiply operator -KRMat4& KRMat4::operator*(const KRMat4 &m) { - KRMat4 result = *this; - result *= m; - return result; -} - - - -/* Generate a perspective view matrix using a field of view angle fov, - * window aspect ratio, near and far clipping planes */ -void KRMat4::perspective(GLfloat fov, GLfloat aspect, GLfloat nearz, GLfloat farz) { - GLfloat range; - - range = tan(fov * 0.00872664625) * nearz; /* 0.00872664625 = PI/360 */ - memset(m_mat, 0, sizeof(GLfloat) * 16); - m_mat[0] = (2 * nearz) / ((range * aspect) - (-range * aspect)); - m_mat[5] = (2 * nearz) / (2 * range); - m_mat[10] = -(farz + nearz) / (farz - nearz); - m_mat[11] = -1; - m_mat[14] = -(2 * farz * nearz) / (farz - nearz); -} - -/* Perform translation operations on a matrix */ -void KRMat4::translate(GLfloat x, GLfloat y, GLfloat z) { - KRMat4 newMatrix; // Create new identity matrix - - newMatrix.m_mat[12] = x; - newMatrix.m_mat[13] = y; - newMatrix.m_mat[14] = z; - - *this *= newMatrix; -} - -/* Rotate a matrix by an angle on a X, Y, or Z axis */ -void KRMat4::rotate(GLfloat angle, AXIS axis) { - // const GLfloat d2r = 0.0174532925199; /* PI / 180 */ - const int cos1[3] = { 5, 0, 0 }; - const int cos2[3] = { 10, 10, 5 }; - const int sin1[3] = { 6, 2, 1 }; - const int sin2[3] = { 9, 8, 4 }; - - KRMat4 newMatrix; // Create new identity matrix - - newMatrix.m_mat[cos1[axis]] = cos(angle); - newMatrix.m_mat[sin1[axis]] = -sin(angle); - newMatrix.m_mat[sin2[axis]] = -newMatrix.m_mat[sin1[axis]]; - newMatrix.m_mat[cos2[axis]] = newMatrix.m_mat[cos1[axis]]; - - *this *= newMatrix; -} - -void KRMat4::scale(GLfloat x, GLfloat y, GLfloat z) { - KRMat4 newMatrix; // Create new identity matrix - - newMatrix.m_mat[0] = x; - newMatrix.m_mat[5] = y; - newMatrix.m_mat[10] = z; - - *this *= newMatrix; -} - -void KRMat4::scale(GLfloat s) { - scale(s,s,s); -} diff --git a/objview/Classes/krengine/KRMat4.h b/objview/Classes/krengine/KRMat4.h deleted file mode 100644 index 3869804..0000000 --- a/objview/Classes/krengine/KRMat4.h +++ /dev/null @@ -1,69 +0,0 @@ -// -// KRMat4.h -// gldemo -// -// Created by Kearwood Gilbert on 10-09-21. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#import -#import - -#ifndef KRMAT4_I -#define KRMAT4_I - - -#define EMPTY_MATRIX4 { 0.0, 0.0, 0.0, 0.0,\ -0.0, 0.0, 0.0, 0.0,\ -0.0, 0.0, 0.0, 0.0,\ -0.0, 0.0, 0.0, 0.0 } - -#define IDENTITY_MATRIX4 { 1.0, 0.0, 0.0, 0.0,\ -0.0, 1.0, 0.0, 0.0,\ -0.0, 0.0, 1.0, 0.0,\ -0.0, 0.0, 0.0, 1.0 } - -typedef enum { - X_AXIS, - Y_AXIS, - Z_AXIS -} AXIS; - - -class KRMat4 { - - GLfloat m_mat[16]; - -public: - - // Default constructor - Creates an identity matrix - KRMat4(); - - // Destructor - ~KRMat4(); - - // Copy constructor - KRMat4(const KRMat4 &m); - - // Overload assignment operator - KRMat4& operator=(const KRMat4 &m); - - // Overload compound multiply operator - KRMat4& operator*=(const KRMat4 &m); - - // Overload multiply operator - KRMat4& operator*(const KRMat4 &m); - - GLfloat *getPointer(); - - void perspective(GLfloat fov, GLfloat aspect, GLfloat nearz, GLfloat farz); - void translate(GLfloat x, GLfloat y, GLfloat z); - void scale(GLfloat x, GLfloat y, GLfloat z); - void scale(GLfloat s); - void rotate(GLfloat angle, AXIS axis); - -}; - - - -#endif // KRMAT4_I \ No newline at end of file diff --git a/objview/Classes/krengine/KRMaterial.cpp b/objview/Classes/krengine/KRMaterial.cpp deleted file mode 100644 index b87e135..0000000 --- a/objview/Classes/krengine/KRMaterial.cpp +++ /dev/null @@ -1,148 +0,0 @@ -// -// KRMaterial.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-10-24. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#include "KRMaterial.h" - -KRMaterial::KRMaterial() { - m_pAmbientMap = NULL; - m_pDiffuseMap = NULL; - m_pSpecularMap = NULL; - m_pNormalMap = NULL; - m_ka_r = (GLfloat)0.0f; - m_ka_g = (GLfloat)0.0f; - m_ka_b = (GLfloat)0.0f; - m_kd_r = (GLfloat)1.0f; - m_kd_g = (GLfloat)1.0f; - m_kd_b = (GLfloat)1.0f; - m_ks_r = (GLfloat)1.0f; - m_ks_g = (GLfloat)1.0f; - m_ks_b = (GLfloat)1.0f; -} - -KRMaterial::~KRMaterial() { - -} - -void KRMaterial::setAmbientMap(KRTexture *pTexture) { - m_pAmbientMap = pTexture; -} - -void KRMaterial::setDiffuseMap(KRTexture *pTexture) { - m_pDiffuseMap = pTexture; -} - -void KRMaterial::setSpecularMap(KRTexture *pTexture) { - m_pSpecularMap = pTexture; -} - -void KRMaterial::setNormalMap(KRTexture *pTexture) { - m_pNormalMap = pTexture; -} - -void KRMaterial::setAmbient(GLfloat r, GLfloat g, GLfloat b) { - m_ka_r = r; - m_ka_g = g; - m_ka_b = b; -} - -void KRMaterial::setDiffuse(GLfloat r, GLfloat g, GLfloat b) { - m_kd_r = r; - m_kd_g = g; - m_kd_b = b; -} - -void KRMaterial::setSpecular(GLfloat r, GLfloat g, GLfloat b) { - m_ks_r = r; - m_ks_g = g; - m_ks_b = b; -} - -void KRMaterial::bind(GLuint program) { - - GLuint uniform_material_ambient = glGetUniformLocation(program, "material_ambient"); - GLuint uniform_material_diffuse = glGetUniformLocation(program, "material_diffuse"); - GLuint uniform_material_specular = glGetUniformLocation(program, "material_specular"); - - glUniform3f( - uniform_material_ambient, - m_ka_r, // iMaterial % 2 ? (GLfloat)0.9f : (GLfloat)0.5f, - m_ka_g, // iMaterial % 4 ? (GLfloat)0.9f : (GLfloat)0.5f, - m_ka_b // iMaterial % 8 ? (GLfloat)0.9f : (GLfloat)0.5f, - ); - - glUniform3f( - uniform_material_diffuse, - m_kd_r + 1.0f, // 1.0 added so there will not be complete darkness - m_kd_g + 1.0f, // 1.0 added so there will not be complete darkness - m_kd_b + 1.0f // 1.0 added so there will not be complete darkness - ); - - glUniform3f( - uniform_material_specular, - m_ks_r, // iMaterial % 2 ? (GLfloat)0.9f : (GLfloat)0.5f, - m_ks_g, // iMaterial % 4 ? (GLfloat)0.9f : (GLfloat)0.5f, - m_ks_b // iMaterial % 8 ? (GLfloat)0.9f : (GLfloat)0.5f, - ); - - - - int iTextureName = 0; - if(m_pDiffuseMap != NULL) { - iTextureName = m_pDiffuseMap->getName(); - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, iTextureName); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - } - - - iTextureName = 0; - if(m_pSpecularMap != NULL) { - iTextureName = m_pSpecularMap->getName(); - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, iTextureName); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - } - - - iTextureName = 0; - if(m_pNormalMap != NULL) { - iTextureName = m_pNormalMap->getName(); - glActiveTexture(GL_TEXTURE2); - glBindTexture(GL_TEXTURE_2D, iTextureName); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - } - - - - -//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); -//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - -/* - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - */ -/* - if (_anisotropySupported) - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, _anisotropyTexParam); - */ -/* - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - */ - - - - -} \ No newline at end of file diff --git a/objview/Classes/krengine/KRMaterial.h b/objview/Classes/krengine/KRMaterial.h deleted file mode 100644 index a318632..0000000 --- a/objview/Classes/krengine/KRMaterial.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// KRMaterial.h -// gldemo -// -// Created by Kearwood Gilbert on 10-10-24. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#import -#import -#import -#import -using std::list; - -#ifndef KRMATERIAL_H -#define KRMATRIAL_H - -#import "KRTexture.h" - -class KRMaterial { -public: - KRMaterial(); - ~KRMaterial(); - - void setAmbientMap(KRTexture *pTexture); - void setDiffuseMap(KRTexture *pTexture); - void setSpecularMap(KRTexture *pTexture); - void setNormalMap(KRTexture *pTexture); - void setAmbient(GLfloat r, GLfloat g, GLfloat b); - void setDiffuse(GLfloat r, GLfloat g, GLfloat b); - void setSpecular(GLfloat r, GLfloat g, GLfloat b); - - void bind(GLuint program); - -private: - KRTexture *m_pAmbientMap; // mtl map_Ka value - KRTexture *m_pDiffuseMap; // mtl map_Kd value - KRTexture *m_pSpecularMap; // mtl map_Ks value - KRTexture *m_pNormalMap; // mtl map_Normal value - - GLfloat m_ka_r, m_ka_g, m_ka_b; // Ambient rgb - GLfloat m_kd_r, m_kd_g, m_kd_b; // Diffuse rgb - GLfloat m_ks_r, m_ks_g, m_ks_b; // Specular rgb -}; - -#endif diff --git a/objview/Classes/krengine/KRMaterialManager.cpp b/objview/Classes/krengine/KRMaterialManager.cpp deleted file mode 100644 index 5326b72..0000000 --- a/objview/Classes/krengine/KRMaterialManager.cpp +++ /dev/null @@ -1,185 +0,0 @@ -// -// KRMaterialManager.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-10-24. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#include "KRMaterialManager.h" - -#import -#include -#include -#include -#include -#include - - -KRMaterialManager::KRMaterialManager(KRTextureManager *pTextureManager) { - m_pTextureManager = pTextureManager; -} - -KRMaterialManager::~KRMaterialManager() { - -} - - -KRMaterial *KRMaterialManager::getMaterial(const char *szName) { - map::iterator itr = m_materials.find(szName); - if(itr == m_materials.end()) { - // Not found - return NULL; - } else { - return (*itr).second; - } -} - -bool KRMaterialManager::loadFile(const char *szPath) { - bool bSuccess = false; - - int fdFile = 0; - int fileSize = 0; - void *pFile = NULL; - KRMaterial *pMaterial = NULL; - char szSymbol[16][64]; - - struct stat statbuf; - fdFile = open(szPath, O_RDONLY); - if(fdFile >= 0) { - if(fstat(fdFile, &statbuf) >= 0) { - if ((pFile = mmap (0, statbuf.st_size, PROT_READ, MAP_SHARED, fdFile, 0)) == (caddr_t) -1) { - } else { - fileSize = statbuf.st_size; - - char *pScan = (char *)pFile; - char *pEnd = (char *)pFile + fileSize; - while(pScan < pEnd) { - - // Scan through whitespace - while(pScan < pEnd && (*pScan == ' ' || *pScan == '\t' || *pScan == '\r' || *pScan == '\n')) { - pScan++; - } - - if(*pScan == '#') { - // Line is a comment line - - // Scan to the end of the line - while(pScan < pEnd && *pScan != '\r' && *pScan != '\n') { - pScan++; - } - } else { - int cSymbols = 0; - while(pScan < pEnd && *pScan != '\n' && *pScan != '\r') { - - char *pDest = szSymbol[cSymbols++]; - while(pScan < pEnd && *pScan != ' ' && *pScan != '\n' && *pScan != '\r') { - *pDest++ = *pScan++; - } - *pDest = '\0'; - - // Scan through whitespace, but don't advance to next line - while(pScan < pEnd && (*pScan == ' ' || *pScan == '\t')) { - pScan++; - } - } - - if(strcmp(szSymbol[0], "newmtl") == 0 && cSymbols >= 2) { - - pMaterial = new KRMaterial(); - m_materials[szSymbol[1]] = pMaterial; - } if(pMaterial != NULL) { - if(strcmp(szSymbol[0], "Ka") == 0) { - char *pScan2 = szSymbol[1]; - double r = strtof(pScan2, &pScan2); - if(cSymbols == 2) { - pMaterial->setAmbient(r, r, r); - } else if(cSymbols == 4) { - pScan2 = szSymbol[2]; - double g = strtof(pScan2, &pScan2); - pScan2 = szSymbol[3]; - double b = strtof(pScan2, &pScan2); - pMaterial->setAmbient(r, g, b); - } - } else if(strcmp(szSymbol[0], "Kd") == 0) { - char *pScan2 = szSymbol[1]; - double r = strtof(pScan2, &pScan2); - if(cSymbols == 2) { - pMaterial->setDiffuse(r, r, r); - } else if(cSymbols == 4) { - pScan2 = szSymbol[2]; - double g = strtof(pScan2, &pScan2); - pScan2 = szSymbol[3]; - double b = strtof(pScan2, &pScan2); - pMaterial->setDiffuse(r, g, b); - } - } else if(strcmp(szSymbol[0], "Ks") == 0) { - char *pScan2 = szSymbol[1]; - double r = strtof(pScan2, &pScan2); - if(cSymbols == 2) { - pMaterial->setSpecular(r, r, r); - } else if(cSymbols == 4) { - pScan2 = szSymbol[2]; - double g = strtof(pScan2, &pScan2); - pScan2 = szSymbol[3]; - double b = strtof(pScan2, &pScan2); - pMaterial->setSpecular(r, g, b); - } - } else if(strncmp(szSymbol[0], "map", 3) == 0) { - // Truncate file extension - char *pScan2 = szSymbol[1]; - char *pLastPeriod = NULL; - while(*pScan2 != '\0') { - if(*pScan2 == '.') { - pLastPeriod = pScan2; - } - pScan2++; - } - if(pLastPeriod) { - *pLastPeriod = '\0'; - } - - KRTexture *pTexture = m_pTextureManager->getTexture(szSymbol[1]); - if(pTexture) { - if(strcmp(szSymbol[0], "map_Ka") == 0) { - pMaterial->setAmbientMap(pTexture); - } else if(strcmp(szSymbol[0], "map_Kd") == 0) { - pMaterial->setDiffuseMap(pTexture); - } else if(strcmp(szSymbol[0], "map_Ks") == 0) { - pMaterial->setSpecularMap(pTexture); - } else if(strcmp(szSymbol[0], "map_Normal") == 0) { - pMaterial->setNormalMap(pTexture); - } - } - } - } - - } - - } - - bSuccess = true; - } - } - } - - if(pFile != NULL) { - munmap(pFile, fileSize); - } - - if(fdFile != 0) { - close(fdFile); - } - - /* - KRMaterial *pMaterial = new KRMaterial(); - - if(!pMaterial->loadFromFile(szPath)) { - delete pMaterial; - return NULL; - } - m_materials[szName] = pMaterial; - */ - - return bSuccess; -} diff --git a/objview/Classes/krengine/KRMaterialManager.h b/objview/Classes/krengine/KRMaterialManager.h deleted file mode 100644 index 70071ed..0000000 --- a/objview/Classes/krengine/KRMaterialManager.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// KRMaterialManager.h -// gldemo -// -// Created by Kearwood Gilbert on 10-10-24. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#ifndef KRMATERIALMANAGER_H -#define KRMATERIALMANAGER_H - -#include "KRMaterial.h" -#include "KRTextureManager.h" - -#include -using std::map; - -class KRMaterialManager { -public: - KRMaterialManager(KRTextureManager *pTextureManager); - ~KRMaterialManager(); - - bool loadFile(const char *szPath); - KRMaterial *getMaterial(const char *szName); - -private: - map m_materials; - KRTextureManager *m_pTextureManager; -}; - -#endif - diff --git a/objview/Classes/krengine/KRModel.cpp b/objview/Classes/krengine/KRModel.cpp deleted file mode 100644 index f711b34..0000000 --- a/objview/Classes/krengine/KRModel.cpp +++ /dev/null @@ -1,615 +0,0 @@ -// -// KRModel.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-09-22. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#import -#include -#include -#include -#include -#include -#include -#include - - -#include "KRModel.h" - -#include "KRVector3.h" - -#define MAX_VBO_SIZE 65535 -// MAX_VBO_SIZE must be divisible by 3 so triangles aren't split across VBO objects... - -#define BUFFER_OFFSET(i) ((char *)NULL + (i)) - -KRModel::KRModel(std::string path, KRMaterialManager *pMaterialManager) { - - m_fdPackFile = 0; - m_pPackFile = NULL; - m_iPackFileSize = 0; - m_cBuffers = 0; - m_pBuffers = NULL; - - // loadWavefront(path, pMaterialManager); - loadPack(path, pMaterialManager); -} - -void KRModel::loadPack(std::string path, KRMaterialManager *pMaterialManager) { - struct stat statbuf; - m_fdPackFile = open(path.c_str(), O_RDONLY); - if(m_fdPackFile >= 0) { - if(fstat(m_fdPackFile, &statbuf) >= 0) { - if ((m_pPackFile = mmap (0, statbuf.st_size, PROT_READ, MAP_SHARED, m_fdPackFile, 0)) == (caddr_t) -1) { - } else { - m_iPackFileSize = statbuf.st_size; - - - pack_header *pHeader = (pack_header *)m_pPackFile; - - m_minx = pHeader->minx; - m_miny = pHeader->miny; - m_minz = pHeader->minz; - m_maxx = pHeader->maxx; - m_maxy = pHeader->maxy; - m_maxz = pHeader->maxz; - - pack_material *pPackMaterials = (pack_material *)(pHeader+1); - - for(int iMaterial=0; iMaterial < pHeader->material_count; iMaterial++) { - pack_material *pPackMaterial = pPackMaterials + iMaterial; - - Material *pMaterial = new Material(); - pMaterial->start_vertex = pPackMaterial->start_vertex; - pMaterial->vertex_count = pPackMaterial->vertex_count; - pMaterial->pMaterial = pMaterialManager->getMaterial(pPackMaterial->szName); - m_materials.push_back(pMaterial); - } - - m_pVertexData = (VertexData *)(pPackMaterials + pHeader->material_count); - - - m_cBuffers = (pHeader->vertex_count + MAX_VBO_SIZE - 1) / MAX_VBO_SIZE; - m_pBuffers = new GLuint[m_cBuffers]; - glGenBuffers(m_cBuffers, m_pBuffers); - for(GLsizei iBuffer=0; iBuffer < m_cBuffers; iBuffer++) { -// if(iBuffer < 30) { - GLsizei cVertexes = iBuffer < m_cBuffers - 1 ? MAX_VBO_SIZE : pHeader->vertex_count % MAX_VBO_SIZE; - glBindBuffer(GL_ARRAY_BUFFER, m_pBuffers[iBuffer]); - glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData) * cVertexes, m_pVertexData + iBuffer * MAX_VBO_SIZE, GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); -// } - - } - } - } - } -} - -void KRModel::loadWavefront(std::string path, KRMaterialManager *pMaterialManager) { - const char *szPath = path.c_str(); - - int fdFile = 0; - int fileSize = 0; - void *pFile = NULL; - char szSymbol[16][64]; - - std::vector materials; - - - Vertex3D *pVertices = NULL; - Vector3D *pNormals = NULL; - TexCoord *pTexCoords = NULL; - int *pFaces = NULL; - - struct stat statbuf; - fdFile = open(szPath, O_RDONLY); - if(fdFile >= 0) { - if(fstat(fdFile, &statbuf) >= 0) { - if ((pFile = mmap (0, statbuf.st_size, PROT_READ, MAP_SHARED, fdFile, 0)) == (caddr_t) -1) { - } else { - fileSize = statbuf.st_size; - - - - // Pass 1 - Get counts - - int cVertices = 0; - int cNormals = 0; - int cTexCoords = 0; - int cVertexData = 0; - - - cVertices = 0; - int cFaces = 1; - GLint cMaterialFaceStart = 1; - - - - // --------- - - - char *pScan = (char *)pFile; - char *pEnd = (char *)pFile + fileSize; - while(pScan < pEnd) { - - // Scan through whitespace - while(pScan < pEnd && (*pScan == ' ' || *pScan == '\t' || *pScan == '\r' || *pScan == '\n')) { - pScan++; - } - - if(*pScan == '#') { - // Line is a comment line - - // Scan to the end of the line - while(pScan < pEnd && *pScan != '\r' && *pScan != '\n') { - pScan++; - } - } else { - int cSymbols = 0; - while(pScan < pEnd && *pScan != '\n' && *pScan != '\r') { - - char *pDest = szSymbol[cSymbols++]; - while(pScan < pEnd && *pScan != ' ' && *pScan != '\n' && *pScan != '\r') { - *pDest++ = *pScan++; - } - *pDest = '\0'; - - // Scan through whitespace, but don't advance to next line - while(pScan < pEnd && (*pScan == ' ' || *pScan == '\t')) { - pScan++; - } - } - - if(strcmp(szSymbol[0], "v") == 0) { - // Vertex (v) - cVertices++; - } else if(strcmp(szSymbol[0], "vt") == 0) { - // Vertex Texture UV Coordinate (vt) - cTexCoords++; - } else if(strcmp(szSymbol[0], "vn") == 0) { - // Vertex Normal (vn) - cNormals++; - } else if(strcmp(szSymbol[0], "f") == 0) { - // Face (f) - int cFaceVertexes = (cSymbols - 3) * 3; // 3 vertexes per triangle. Triangles have 4 symbols. Quads have 5 symbols and generate two triangles. - cVertexData += cFaceVertexes; - cFaces += cFaceVertexes * 3 + 1; // Allocate space for count of vertices, Vertex Index, Texture Coordinate Index, and Normal Index - - } else if(strcmp(szSymbol[0], "usemtl") == 0) { - // Use Material (usemtl) - if(cMaterialFaceStart - cFaces > 0) { - cFaces++; - - } - materials.push_back(pMaterialManager->getMaterial(szSymbol[1])); - } - - } - } - - - // Pass 2 - Populate vertexes and faces - Vertex3D *pVertices = (Vertex3D *)malloc(sizeof(Vertex3D) * cVertices); - Vector3D *pNormals = (Vector3D *)malloc(sizeof(Vector3D) *cNormals); - TexCoord *pTexCoords = (TexCoord *)malloc(sizeof(TexCoord) * cTexCoords); - int *pFaces = (int *)malloc(sizeof(int *) * (cFaces + 1)); - - - Vertex3D *pVertice = pVertices; - Vector3D *pNormal = pNormals; - TexCoord *pTexCoord = pTexCoords; - int *pFace = pFaces; - int *pMaterialFaces = pFace++; - *pMaterialFaces = 0; - - - std::vector::iterator material_itr = materials.begin(); - - // -------- - - pScan = (char *)pFile; - while(pScan < pEnd) { - - // Scan through whitespace - while(pScan < pEnd && (*pScan == ' ' || *pScan == '\t' || *pScan == '\r' || *pScan == '\n')) { - pScan++; - } - - if(*pScan == '#') { - // Line is a comment line - - // Scan to the end of the line - while(pScan < pEnd && *pScan != '\r' && *pScan != '\n') { - pScan++; - } - } else { - int cSymbols = 0; - while(pScan < pEnd && *pScan != '\n' && *pScan != '\r') { - - char *pDest = szSymbol[cSymbols++]; - while(pScan < pEnd && *pScan != ' ' && *pScan != '\n' && *pScan != '\r') { - *pDest++ = *pScan++; - } - *pDest = '\0'; - - // Scan through whitespace, but don't advance to next line - while(pScan < pEnd && (*pScan == ' ' || *pScan == '\t')) { - pScan++; - } - } - - if(strcmp(szSymbol[0], "v") == 0) { - // Vertex (v) - char *pChar = szSymbol[1]; - pVertice -> x = strtof(pChar, &pChar); - pChar = szSymbol[2]; - pVertice -> y = strtof(pChar, &pChar); - pChar = szSymbol[3]; - pVertice -> z = strtof(pChar, &pChar); - pVertice++; - } else if(strcmp(szSymbol[0], "vt") == 0) { - // Vertex Texture UV Coordinate (vt) - char *pChar = szSymbol[1]; - pTexCoord -> u = strtof(pChar, &pChar); - pChar = szSymbol[2]; - pTexCoord -> v = strtof(pChar, &pChar); - pTexCoord++; - } else if(strcmp(szSymbol[0], "vn") == 0) { - // Vertex Normal (vn) - char *pChar = szSymbol[1]; - pNormal -> x = strtof(pChar, &pChar); - pChar = szSymbol[2]; - pNormal -> y = strtof(pChar, &pChar); - pChar = szSymbol[3]; - pNormal -> z = strtof(pChar, &pChar); - pNormal++; - } else if(strcmp(szSymbol[0], "f") == 0) { - // Face (f) - GLint cFaceVertices = cSymbols - 1; - - *pFace++ = cFaceVertices; - for(int iSymbol=1; iSymbol < cSymbols; iSymbol++) { - char *pChar = szSymbol[iSymbol]; - if(*pChar == '.' || (*pChar >= '0' && *pChar <= '9')) { - *pFace++ = strtol(pChar, &pChar, 10) - 1; // Vertex Index - - if(*pChar == '/') { - pChar++; - if(*pChar == '/') { - *pFace++ = -1; - } else { - *pFace++ = strtol(pChar, &pChar, 10) - 1; // Texture Coordinate Index - } - } else { - *pFace++ = -1; - } - - if(*pChar == '/') { - pChar++; - if(*pChar == '/') { - *pFace++ = -1; - } else { - *pFace++ = strtol(pChar, &pChar, 10) - 1; // Normal Index - } - } else { - *pFace++ = -1; - } - while(*pChar == '/') { - pChar++; - strtol(pChar, &pChar, 10); - } - } - } - - - } else if(strcmp(szSymbol[0], "usemtl") == 0) { - // Use Material (usemtl) - if(pFace - pMaterialFaces > 1) { - *pMaterialFaces = pFace - pMaterialFaces - 1; - pMaterialFaces = pFace++; - } - } - } - } - - - *pMaterialFaces = pFace - pMaterialFaces - 1; - *pFace++ = 0; - - - m_pVertexData = (VertexData *)malloc(sizeof(VertexData) * cVertexData); - - VertexData *pData = m_pVertexData; - - int iVertex = 0; - Material *pMaterial = new Material(); - pMaterial->start_vertex = iVertex; - pMaterial->vertex_count = 0; - if(material_itr < materials.end()) { - pMaterial->pMaterial = *material_itr++; - } else { - pMaterial->pMaterial = NULL; - } - m_materials.push_back(pMaterial); - - - pFace = pFaces; - while(*pFace != 0 && iVertex < cVertexData) { - pMaterial->start_vertex = iVertex; - - int *pMaterialEndFace = pFace + *pFace++; - while(pFace < pMaterialEndFace) { - int cFaceVertexes = *pFace; - VertexData *pFirstFaceVertex = NULL; - VertexData *pPrevFaceVertex = NULL; - for(int iFaceVertex=0; iFaceVertex < cFaceVertexes; iFaceVertex++) { - if(iFaceVertex > 2) { - // There have already been 3 vertices. Now we need to split the quad into a second triangle composed of the 1st, 3rd, and 4th vertices - memcpy(pData++, pFirstFaceVertex, sizeof(VertexData)); - memcpy(pData++, pPrevFaceVertex, sizeof(VertexData)); - iVertex+=2; - } - Vertex3D *pVertex = pVertices + pFace[iFaceVertex*3+1]; - if(iFaceVertex==0) { - pFirstFaceVertex = pData; - } - pPrevFaceVertex = pData; - pData->vertex.x = pVertex -> x; - pData->vertex.y = pVertex -> y; - pData->vertex.z = pVertex -> z; - - if(pFace[iFaceVertex*3+2] >= 0) { - TexCoord *pTexCoord = pTexCoords + pFace[iFaceVertex*3+2]; - pData->texcoord.u = pTexCoord -> u; - pData->texcoord.v = pTexCoord -> v; - } else { - pData->texcoord.u = 0; - pData->texcoord.v = 0; - } - - if(pFace[iFaceVertex*3+3] >= 0){ - Vector3D *pNormal = pNormals + pFace[iFaceVertex*3+3]; - pData->normal.x = pNormal -> x; - pData->normal.y = pNormal -> y; - pData->normal.z = pNormal -> z; - } else { - pData->normal.x = 0; - pData->normal.y = 0; - pData->normal.z = 0; - } - - pData++; - iVertex++; - } - pFace += cFaceVertexes * 3 + 1; - } - pMaterial->vertex_count = iVertex - pMaterial->start_vertex; - if(*pFace != 0) { - pMaterial = new Material(); - pMaterial->start_vertex = iVertex; - pMaterial->vertex_count = 0; - if(material_itr < materials.end()) { - pMaterial->pMaterial = *material_itr++; - } else { - pMaterial->pMaterial = NULL; - } - m_materials.push_back(pMaterial); - } - } - } - } - } - - - m_minx = 0.0; - m_miny = 0.0; - m_minz = 0.0; - m_maxx = 0.0; - m_maxy = 0.0; - m_maxz = 0.0; - - - - // Calculate surface normals and tangents - // http://www.terathon.com/code/tangent.html - // http://www.fabiensanglard.net/bumpMapping/index.php - - for(std::vector::iterator itr = m_materials.begin(); itr != m_materials.end(); itr++) { - VertexData *pStart = m_pVertexData + (*itr)->start_vertex; - VertexData *pEnd = pStart + (*itr)->vertex_count; - for(VertexData *pVertex = pStart; pVertex < pEnd; pVertex+=3) { - if(pVertex->vertex.x < m_minx) m_minx = pVertex->vertex.x; - if(pVertex->vertex.x > m_maxx) m_maxx = pVertex->vertex.x; - if(pVertex->vertex.y < m_miny) m_miny = pVertex->vertex.y; - if(pVertex->vertex.y > m_maxy) m_maxy = pVertex->vertex.y; - if(pVertex->vertex.z < m_minz) m_minz = pVertex->vertex.z; - if(pVertex->vertex.z > m_maxz) m_maxz = pVertex->vertex.z; - } - - - for(VertexData *pVertex = pStart; pVertex < pEnd; pVertex+=3) { - Vector3 p1(pVertex[0].vertex.x, pVertex[0].vertex.y, pVertex[0].vertex.z); - Vector3 p2(pVertex[1].vertex.x, pVertex[1].vertex.y, pVertex[1].vertex.z); - Vector3 p3(pVertex[2].vertex.x, pVertex[2].vertex.y, pVertex[2].vertex.z); - Vector3 v1 = p2 - p1; - Vector3 v2 = p3 - p1; - - // -- Calculate normal -- - if(pVertex->normal.x == 0 && pVertex->normal.y == 0 && pVertex->normal.z == 0) { - - - Vector3 normal = v1.cross( v2 ); - - normal.normalize(); - - pVertex[0].normal.x = normal.x; - pVertex[0].normal.y = normal.y; - pVertex[0].normal.z = normal.z; - - pVertex[1].normal.x = normal.x; - pVertex[1].normal.y = normal.y; - pVertex[1].normal.z = normal.z; - - pVertex[2].normal.x = normal.x; - pVertex[2].normal.y = normal.y; - pVertex[2].normal.z = normal.z; - } - - // -- Calculate tangent -- - TexCoord st1; // = pVertex[2].texcoord; - TexCoord st2; // = pVertex[1].texcoord; - st1.u = pVertex[1].texcoord.u - pVertex[0].texcoord.u; - st1.v = pVertex[1].texcoord.v - pVertex[0].texcoord.v; - st2.u = pVertex[2].texcoord.u - pVertex[0].texcoord.u; - st2.v = pVertex[2].texcoord.v - pVertex[0].texcoord.v; - double coef = 1/ (st1.u * st2.v - st2.u * st1.v); - - pVertex[0].tangent.x = coef * ((v1.x * st2.v) + (v2.x * -st1.v)); - pVertex[0].tangent.y = coef * ((v1.y * st2.v) + (v2.y * -st1.v)); - pVertex[0].tangent.z = coef * ((v1.z * st2.v) + (v2.z * -st1.v)); - - Vector3 tangent( - coef * ((v1.x * st2.v) + (v2.x * -st1.v)), - coef * ((v1.y * st2.v) + (v2.y * -st1.v)), - coef * ((v1.z * st2.v) + (v2.z * -st1.v)) - ); - - tangent.normalize(); - - pVertex[0].tangent.x = tangent.x; - pVertex[0].tangent.y = tangent.y; - pVertex[0].tangent.z = tangent.z; - pVertex[1].tangent.x = tangent.x; - pVertex[1].tangent.y = tangent.y; - pVertex[1].tangent.z = tangent.z; - pVertex[2].tangent.x = tangent.x; - pVertex[2].tangent.y = tangent.y; - pVertex[2].tangent.z = tangent.z; - - - } - - } - - - if(pFile != NULL) { - munmap(pFile, fileSize); - } - - if(fdFile != 0) { - close(fdFile); - } - - if(pVertices) { - free(pVertices); - } - if(pNormals) { - free(pNormals); - } - if(pTexCoords) { - free(pTexCoords); - } - if(pFaces) { - free(pFaces); - } -} - -KRModel::~KRModel() { - - if(m_pPackFile != NULL) { - munmap(m_pPackFile, m_iPackFileSize); - } - if(m_fdPackFile) { - close(m_fdPackFile); - } else { - // If we didn't load a packed file, then the data was calculated at run time and malloc'ed - if(m_pVertexData != NULL) { - free(m_pVertexData); - } - } - - if(m_pBuffers != NULL) { - glDeleteBuffers(m_cBuffers, m_pBuffers); - delete m_pBuffers; - } -} - -void KRModel::render(GLuint program, GLuint iVertexAttrib, GLuint iNormalAttrib, GLuint iTangentAttrib, GLuint iTexCoordAttrib, KRMaterialManager *pMaterialManager) { - for(std::vector::iterator itr = m_materials.begin(); itr != m_materials.end(); itr++) { - - KRMaterial *pMaterial = (*itr)->pMaterial; - - if(pMaterial != NULL) { - pMaterial->bind(program); - } else { - pMaterial = new KRMaterial(); - pMaterial->bind(program); - delete pMaterial; - } - - int iVertex = (*itr)->start_vertex; - int iBuffer = iVertex / MAX_VBO_SIZE; - iVertex = iVertex % MAX_VBO_SIZE; - int cVertexes = (*itr)->vertex_count; - while(cVertexes > 0) { - glBindBuffer(GL_ARRAY_BUFFER, m_pBuffers[iBuffer]); - - glVertexAttribPointer(iVertexAttrib, 3, GL_FLOAT, 0, sizeof(VertexData), BUFFER_OFFSET(0)); - glEnableVertexAttribArray(iVertexAttrib); - - glVertexAttribPointer(iNormalAttrib, 3, GL_FLOAT, 0, sizeof(VertexData), BUFFER_OFFSET(sizeof(Vertex3D))); - glEnableVertexAttribArray(iNormalAttrib); - - glVertexAttribPointer(iTangentAttrib, 3, GL_FLOAT, 0, sizeof(VertexData), BUFFER_OFFSET(sizeof(Vertex3D) + sizeof(Vector3D))); - glEnableVertexAttribArray(iTangentAttrib); - - glVertexAttribPointer(iTexCoordAttrib, 2, GL_FLOAT, 0, sizeof(VertexData), BUFFER_OFFSET(sizeof(Vertex3D) + sizeof(Vector3D) * 2)); - glEnableVertexAttribArray(iTexCoordAttrib); - - if(iVertex + cVertexes >= MAX_VBO_SIZE) { - glDrawArrays(GL_TRIANGLES, iVertex, (MAX_VBO_SIZE - iVertex)); - cVertexes -= (MAX_VBO_SIZE - iVertex); - iVertex = 0; - iBuffer++; - } else { - glDrawArrays(GL_TRIANGLES, iVertex, cVertexes); - cVertexes = 0; - } - - } - glBindBuffer(GL_ARRAY_BUFFER, 0); - - } - -} - - -GLfloat KRModel::getMaxDimension() { - GLfloat m = 0.0; - if(m_maxx - m_minx > m) m = m_maxx - m_minx; - if(m_maxy - m_miny > m) m = m_maxy - m_miny; - if(m_maxz - m_minz > m) m = m_maxz - m_minz; - return m; -} - -GLfloat KRModel::getMinX() { - return m_minx; -} -GLfloat KRModel::getMaxX() { - return m_maxx; -} -GLfloat KRModel::getMinY() { - return m_miny; -} -GLfloat KRModel::getMaxY() { - return m_maxy; -} -GLfloat KRModel::getMinZ() { - return m_minz; -} -GLfloat KRModel::getMaxZ() { - return m_maxz; -} diff --git a/objview/Classes/krengine/KRModel.h b/objview/Classes/krengine/KRModel.h deleted file mode 100644 index 7820303..0000000 --- a/objview/Classes/krengine/KRModel.h +++ /dev/null @@ -1,97 +0,0 @@ -// -// KRModel.h -// gldemo -// -// Created by Kearwood Gilbert on 10-09-22. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#import -#import -#import -#import - -using std::vector; - -#ifndef KRMODEL_I -#define KRMODEL_I - -#import "KRMaterialManager.h" - - - -class KRModel { - -public: - KRModel(std::string path, KRMaterialManager *pMaterialManager); - ~KRModel(); - - void render(GLuint program, GLuint iVertexAttrib, GLuint iNormalAttrib, GLuint iTangentAttrib, GLuint iTexCoordAttrib, KRMaterialManager *pMaterialManager); - - GLfloat getMaxDimension(); - GLfloat getMinX(); - GLfloat getMaxX(); - GLfloat getMinY(); - GLfloat getMaxY(); - GLfloat getMinZ(); - GLfloat getMaxZ(); - -private: - - void loadWavefront(std::string path, KRMaterialManager *pMaterialManager); - void loadPack(std::string path, KRMaterialManager *pMaterialManager); - - int m_fdPackFile; - void *m_pPackFile; - int m_iPackFileSize; - - typedef struct { - char szTag[16]; - float minx, miny, minz, maxx, maxy, maxz; - int32_t vertex_count; - int32_t material_count; - } pack_header; - - typedef struct { - int32_t start_vertex; - int32_t vertex_count; - char szName[64]; - } pack_material; - - typedef struct { - GLfloat x; - GLfloat y; - GLfloat z; - } Vertex3D, Vector3D; - - typedef struct { - GLfloat u; - GLfloat v; - } TexCoord; - - typedef struct { - Vertex3D vertex; - Vector3D normal; - Vector3D tangent; - TexCoord texcoord; - } VertexData; - - VertexData *m_pVertexData; - - typedef struct { - GLint start_vertex; - GLsizei vertex_count; - KRMaterial *pMaterial; - } Material; - - GLsizei m_cBuffers; - GLuint *m_pBuffers; - - vector m_materials; - - GLfloat m_minx, m_miny, m_minz, m_maxx, m_maxy, m_maxz; - -}; - - -#endif // KRMODEL_I \ No newline at end of file diff --git a/objview/Classes/krengine/KRModelManager.cpp b/objview/Classes/krengine/KRModelManager.cpp deleted file mode 100644 index 8ce0012..0000000 --- a/objview/Classes/krengine/KRModelManager.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// KRModelManager.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-12-31. -// Copyright 2010 Kearwood Software. All rights reserved. -// - -#include "KRModelManager.h" diff --git a/objview/Classes/krengine/KRModelManager.h b/objview/Classes/krengine/KRModelManager.h deleted file mode 100644 index 069b126..0000000 --- a/objview/Classes/krengine/KRModelManager.h +++ /dev/null @@ -1,7 +0,0 @@ -// -// KRModelManager.h -// gldemo -// -// Created by Kearwood Gilbert on 10-12-31. -// Copyright 2010 Kearwood Software. All rights reserved. -// diff --git a/objview/Classes/krengine/KRTexture.cpp b/objview/Classes/krengine/KRTexture.cpp deleted file mode 100644 index 8190b53..0000000 --- a/objview/Classes/krengine/KRTexture.cpp +++ /dev/null @@ -1,206 +0,0 @@ -// -// KRTexture.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-10-23. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#include "KRTexture.h" - -#import -#include -#include -#include -#include -#include -#import - - -#define PVR_TEXTURE_FLAG_TYPE_MASK 0xff - -static char gPVRTexIdentifier[5] = "PVR!"; - -enum -{ - kPVRTextureFlagTypePVRTC_2 = 24, - kPVRTextureFlagTypePVRTC_4 -}; - -typedef struct _PVRTexHeader -{ - uint32_t headerLength; - uint32_t height; - uint32_t width; - uint32_t numMipmaps; - uint32_t flags; - uint32_t dataLength; - uint32_t bpp; - uint32_t bitmaskRed; - uint32_t bitmaskGreen; - uint32_t bitmaskBlue; - uint32_t bitmaskAlpha; - uint32_t pvrTag; - uint32_t numSurfs; -} PVRTexHeader; - -KRTexture::KRTexture() { - m_iName = 0; - m_fdFile = 0; - m_pFile = NULL; - m_fileSize = 0; -} - -KRTexture::~KRTexture() { - if(m_iName != 0) { - glDeleteTextures(1, &m_iName); - } - if(m_pFile != NULL) { - munmap(m_pFile, m_fileSize); - } - if(m_fdFile != 0) { - close(m_fdFile); - } -} - -bool KRTexture::loadFromFile(const char *szFile) { - struct stat statbuf; - m_fdFile = open(szFile, O_RDONLY); - if(m_fdFile < 0) { - return false; - } else { - if(fstat(m_fdFile,&statbuf) < 0) { - return false; - } else { - void *pFile; - if ((pFile = mmap (0, statbuf.st_size, PROT_READ, MAP_SHARED, m_fdFile, 0)) - == (caddr_t) -1) { - return false; - } else { - m_fileSize = statbuf.st_size; - m_pFile = pFile; - - PVRTexHeader *header = (PVRTexHeader *)pFile; - uint32_t formatFlags = header->flags & PVR_TEXTURE_FLAG_TYPE_MASK; - if (formatFlags == kPVRTextureFlagTypePVRTC_4) { - m_internalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG; - } else if(formatFlags == kPVRTextureFlagTypePVRTC_2) { - m_internalFormat = GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG; - } - - uint32_t pvrTag = header->pvrTag; - if (gPVRTexIdentifier[0] != ((pvrTag >> 0) & 0xff) || - gPVRTexIdentifier[1] != ((pvrTag >> 8) & 0xff) || - gPVRTexIdentifier[2] != ((pvrTag >> 16) & 0xff) || - gPVRTexIdentifier[3] != ((pvrTag >> 24) & 0xff)) - { - return false; - } - - m_iWidth = header->width; // Note: call __builtin_bswap32 when needed to switch endianness - m_iHeight = header->height; - m_bHasAlpha = header->bitmaskAlpha; - - uint8_t *bytes = ((uint8_t *)pFile) + sizeof(PVRTexHeader); - uint32_t dataLength = header->dataLength, dataOffset = 0, dataSize = 0; - uint32_t width = m_iWidth, height = m_iHeight, bpp = 4; - uint32_t blockSize = 0, widthBlocks = 0, heightBlocks = 0; - - // Calculate the data size for each texture level and respect the minimum number of blocks - while(dataOffset < dataLength) { - if (formatFlags == kPVRTextureFlagTypePVRTC_4) { - blockSize = 4 * 4; // Pixel by pixel block size for 4bpp - widthBlocks = width / 4; - heightBlocks = height / 4; - bpp = 4; - } else { - blockSize = 8 * 4; // Pixel by pixel block size for 2bpp - widthBlocks = width / 8; - heightBlocks = height / 4; - bpp = 2; - } - - // Clamp to minimum number of blocks - if (widthBlocks < 2) { - widthBlocks = 2; - } - if (heightBlocks < 2) { - heightBlocks = 2; - } - dataSize = widthBlocks * heightBlocks * ((blockSize * bpp) / 8); - - dataBlockStruct newBlock; - newBlock.start = bytes+dataOffset; - newBlock.length = dataSize; - - m_blocks.push_back(newBlock); - - dataOffset += dataSize; - - width = width >> 1; - if(width < 1) { - width = 1; - } - height = height >> 1; - if(height < 1) { - height = 1; - } - } - - return true; - } - } - } -} - -bool KRTexture::createGLTexture() { - int width = m_iWidth; - int height = m_iHeight; - GLenum err; - - if (m_blocks.size() > 0) - { - if (m_iName != 0) { - glDeleteTextures(1, &m_iName); - } - - glGenTextures(1, &m_iName); - glBindTexture(GL_TEXTURE_2D, m_iName); - } - - if (m_blocks.size() > 1) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - } else { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - } - int i=0; - for(std::list::iterator itr = m_blocks.begin(); itr != m_blocks.end(); itr++) { - dataBlockStruct block = *itr; - glCompressedTexImage2D(GL_TEXTURE_2D, i, m_internalFormat, width, height, 0, block.length, block.start); - - err = glGetError(); - if (err != GL_NO_ERROR) { - return false; - } - - width = width >> 1; - if(width < 1) { - width = 1; - } - height = height >> 1; - if(height < 1) { - height = 1; - } - - i++; - } - - return true; -} - -GLuint KRTexture::getName() { - if(m_iName == 0) { - createGLTexture(); - } - return m_iName; -} \ No newline at end of file diff --git a/objview/Classes/krengine/KRTexture.h b/objview/Classes/krengine/KRTexture.h deleted file mode 100644 index a28cb59..0000000 --- a/objview/Classes/krengine/KRTexture.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// KRTexture.h -// gldemo -// -// Created by Kearwood Gilbert on 10-10-23. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#import -#import -#import -#import -using std::list; - -#ifndef KRTEXTURE_H -#define KRTEXTURE_H - -class KRTexture { -public: - KRTexture(); - ~KRTexture(); - - bool loadFromFile(const char *szFile); - bool createGLTexture(); - GLuint getName(); - -private: - - GLuint m_iName; - uint32_t m_iWidth; - uint32_t m_iHeight; - GLenum m_internalFormat; - bool m_bHasAlpha; - - struct dataBlockStruct { - void *start; - uint32_t length; - }; - - list m_blocks; - - int m_fdFile; - int m_fileSize; - void *m_pFile; -}; - -#endif diff --git a/objview/Classes/krengine/KRTextureManager.cpp b/objview/Classes/krengine/KRTextureManager.cpp deleted file mode 100644 index 7dda2a8..0000000 --- a/objview/Classes/krengine/KRTextureManager.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// -// KRTextureManager.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-10-14. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#include "KRTextureManager.h" -#include - -KRTextureManager::KRTextureManager() { - -} - -KRTextureManager::~KRTextureManager() { - for(map::iterator itr = m_textures.begin(); itr != m_textures.end(); ++itr){ - delete (*itr).second; - } -} - -KRTexture *KRTextureManager::loadTexture(const char *szName, const char *szPath) { - KRTexture *pTexture = new KRTexture(); - if(!pTexture->loadFromFile(szPath)) { - delete pTexture; - return NULL; - } - - if(!pTexture->createGLTexture()) { - delete pTexture; - return NULL; - } - - std::string lowerName = szName; - std::transform(lowerName.begin(), lowerName.end(), - lowerName.begin(), ::tolower); - - - - m_textures[lowerName] = pTexture; - return pTexture; -} - -GLuint KRTextureManager::getTextureName(const char *szName) { - KRTexture *pTexture = getTexture(szName); - if(pTexture) { - return pTexture->getName(); - } else { - return NULL; - } -} - -KRTexture *KRTextureManager::getTexture(const char *szName) { - std::string lowerName = szName; - std::transform(lowerName.begin(), lowerName.end(), - lowerName.begin(), ::tolower); - - map::iterator itr = m_textures.find(lowerName); - if(itr == m_textures.end()) { - // Not found - return NULL; - } else { - return (*itr).second; - } - -} \ No newline at end of file diff --git a/objview/Classes/krengine/KRTextureManager.h b/objview/Classes/krengine/KRTextureManager.h deleted file mode 100644 index 8c3016f..0000000 --- a/objview/Classes/krengine/KRTextureManager.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// KRTextureManager.h -// gldemo -// -// Created by Kearwood Gilbert on 10-10-14. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// - -#ifndef KRTEXTUREMANAGER_H -#define KRTEXTUREMANAGER_H - -#include "KRTexture.h" - -#include -using std::map; - -class KRTextureManager { -public: - KRTextureManager(); - ~KRTextureManager(); - - KRTexture *loadTexture(const char *szName, const char *szPath); - GLuint getTextureName(const char *szName); - KRTexture *getTexture(const char *szFile); - -private: - map m_textures; -}; - -#endif diff --git a/objview/Classes/krengine/KRVector3.cpp b/objview/Classes/krengine/KRVector3.cpp deleted file mode 100644 index 0ee4957..0000000 --- a/objview/Classes/krengine/KRVector3.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// -// KRVector3.cpp -// gldemo -// -// Created by Kearwood Gilbert on 10-12-31. -// Copyright 2010 Kearwood Software. All rights reserved. -// - -#include "KRVector3.h" - -//default constructor -Vector3::Vector3(float X = 0, float Y = 0, float Z = 0) -{ - x = X; - y = Y; - z = Z; -} - -Vector3::~Vector3() -{ -} - -//calculate and return the magnitude of this vector -float Vector3::GetMagnitude() -{ - return sqrtf(x * x + y * y + z * z); -} - -//multiply this vector by a scalar -Vector3 Vector3::operator*(float num) const -{ - return Vector3(x * num, y * num, z * num); -} - -//pass in a vector, pass in a scalar, return the product -/* - Vector3 Vector3::operator*(float num, Vector3 const &vec) -{ - return Vector3(vec.x * num, vec.y * num, vec.z * num); -} - */ - -//add two vectors -Vector3 Vector3::operator+(const Vector3 &vec) const -{ - return Vector3(x + vec.x, y + vec.y, z + vec.z); -} - -//subtract two vectors -Vector3 Vector3::operator-(const Vector3 &vec) const -{ - return Vector3(x - vec.x, y - vec.y, z - vec.z); -} - -//normalize this vector -void Vector3::normalize() -{ - float magnitude = sqrtf(x * x + y * y + z * z); - x /= magnitude; - y /= magnitude; - z /= magnitude; -} - -//calculate and return dot product -float Vector3::dot(const Vector3 &vec) const -{ - return x * vec.x + y * vec.y + z * vec.z; -} - -//calculate and return cross product -Vector3 Vector3::cross(const Vector3 &vec) const -{ - return Vector3(y * vec.z - z * vec.y, - z * vec.x - x * vec.z, - x * vec.y - y * vec.x); -} diff --git a/objview/Classes/krengine/KRVector3.h b/objview/Classes/krengine/KRVector3.h deleted file mode 100644 index df77a79..0000000 --- a/objview/Classes/krengine/KRVector3.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// KRVector3.h -// gldemo -// -// Created by Kearwood Gilbert on 10-12-31. -// Copyright 2010 Kearwood Software. All rights reserved. -// - -#ifndef KRVECTOR3 -#define KRVECTOR3 -#include - -class Vector3 -{ - -public: - float x, y, z; - - //default constructor - - Vector3(float X, float Y, float Z); - ~Vector3(); - - //calculate and return the magnitude of this vector - float GetMagnitude(); - - //multiply this vector by a scalar - Vector3 operator*(float num) const; - - //pass in a vector, pass in a scalar, return the product - //friend Vector3 operator*(float num, Vector3 const &vec); - - //add two vectors - Vector3 operator+(const Vector3 &vec) const; - - //subtract two vectors - Vector3 operator-(const Vector3 &vec) const; - - //normalize this vector - void normalize(); - - //calculate and return dot product - float dot(const Vector3 &vec) const; - - //calculate and return cross product - Vector3 cross(const Vector3 &vec) const; -}; - -#endif \ No newline at end of file diff --git a/objview/Classes/krengine/Shaders/ObjectShader.fsh b/objview/Classes/krengine/Shaders/ObjectShader.fsh deleted file mode 100644 index 8e96236..0000000 --- a/objview/Classes/krengine/Shaders/ObjectShader.fsh +++ /dev/null @@ -1,168 +0,0 @@ -// -// Shader.fsh -// gldemo -// -// Based on http://www.fabiensanglard.net/bumpMapping/index.php - - -/* - -// -- Per vertex lighting - -uniform sampler2D diffuseTexture, specularTexture, normalTexture; -varying mediump vec2 texCoord; -varying mediump vec3 diffuse; -varying mediump vec3 specular; -void main (void) -{ - mediump vec3 texColour = vec3(texture2D(diffuseTexture, texCoord)); - mediump vec3 specColor = vec3(texture2D(specularTexture, texCoord)); - mediump vec3 normalVal = vec3(texture2D(normalTexture, texCoord)); - //mediump vec3 colour = (texColour * diffuse) + specular; - mediump vec3 colour = (texColour * diffuse) + (specColor * specular); - gl_FragColor = vec4(colour, 1.0); -} -*/ - -/* - -// -- Per Pixel lighting, test 1 -- - -uniform sampler2D diffuseTexture, specularTexture, normalTexture; -uniform mediump vec3 material_ambient, material_diffuse, material_specular; - -varying mediump vec2 texCoord; -varying mediump vec3 normal; -varying mediump vec3 ePos; - -const mediump float shininess = 4.0; -const mediump vec3 LightPos = vec3(20.0, 00.0, 10.0); -const mediump vec3 LightCol = vec3(2.0,2.0,2.0); - - -//directional light function // -// spFlg flag using specular or not. -// nrml nrml vector in the eye coordinate. -// ePos vertex position in the eye coordinate. -void DirectionalLight(inout mediump vec3 diffuse, inout mediump vec3 specular, in mediump int spFlg, in mediump vec3 nrml, in mediump vec3 ePos){ - // calculate the light direction vector. - mediump vec3 lightDir = normalize(LightPos); - // calculate the half vector between eye position and light position. - mediump vec3 halfV = normalize(-ePos + LightPos); - // calculate diffuse light intensity. - mediump float dVP = max(dot(nrml,lightDir), 0.0); - // calculate approximated specular light base intensity. - mediump float dHV = max(dot(nrml,halfV),0.0); - // if the diffuse is not zero and spFlg is On, - // calculate specular light intensity with shininess, - // or turn off the specular light. - mediump float pf; - if (dVP>.0 && spFlg==1) pf = pow(dHV, shininess); - else pf = 0.0; - diffuse += dVP*LightCol; - specular += pf*LightCol; -} - -void main (void) -{ - - mediump vec3 texColour = vec3(texture2D(diffuseTexture, texCoord)); - mediump vec3 specColor = vec3(texture2D(specularTexture, texCoord)); - mediump vec3 normalVal = vec3(texture2D(normalTexture, texCoord)); - - - // initalize light intensity parameter. - mediump vec3 diffuse = vec3(0.75); - mediump vec3 specular = vec3(0.0); - - - DirectionalLight(diffuse, specular, 1, normalize(normal + normalVal), ePos); - - specular *= material_specular; - - diffuse = diffuse * material_diffuse + material_ambient; - - - //mediump vec3 colour = (texColour * diffuse) + specular; - mediump vec3 colour = (texColour * diffuse) + (specColor * specular); - gl_FragColor = vec4(colour, 1.0); - -} - -*/ - -/* -// -- Per Pixel lighting, test 2 -- -uniform sampler2D diffuseTexture, specularTexture, normalTexture; -varying mediump vec2 texCoord; -varying mediump vec3 lightVec; -varying mediump vec3 halfVec; -//varying mediump vec3 eyeVec; -uniform mediump vec3 material_ambient, material_diffuse, material_specular; - -void main() -{ - // lookup normal from normal map, move from [0,1] to [-1, 1] range, normalize - mediump vec3 normal = normalize(2.0 * texture2D(normalTexture,texCoord).rgb - 1.0); - - mediump float lamberFactor= max (dot (lightVec, normal), 0.0); - - - gl_FragColor = vec4(0.0); - - if (lamberFactor > 0.0) - { - // compute diffuse lighting - mediump vec4 diffuseMaterial = texture2D(diffuseTexture, texCoord); - mediump vec4 diffuseLight = vec4(material_diffuse, 1.0) + 1.0; // 1.0 added so there will not be complete darkness - - // compute specular lighting - mediump vec4 specularLight = texture2D(specularTexture, texCoord); // Specular value comes from a texture - mediump float shininess = pow (max (dot (halfVec, normal), 0.0), 2.0); - - gl_FragColor = diffuseMaterial * diffuseLight * lamberFactor ; - gl_FragColor += vec4(material_specular, 1.0) * specularLight * shininess; - - } - - // compute ambient - gl_FragColor += vec4(material_ambient, 1.0);; -} - */ - - -// -- Per Pixel lighting, test 3 -- -uniform sampler2D diffuseTexture, specularTexture, normalTexture; -varying mediump vec2 texCoord; -varying mediump vec3 lightVec; -varying mediump vec3 halfVec; -uniform lowp vec3 material_ambient, material_diffuse, material_specular; - -void main() -{ - // compute diffuse lighting - mediump vec4 diffuseMaterial = texture2D(diffuseTexture, texCoord); - - /* - // lookup normal from normal map, move from [0,1] to [-1, 1] range, normalize - mediump vec3 normal = normalize(2.0 * texture2D(normalTexture,texCoord).rgb - 1.0); - - mediump float lamberFactor= max (dot (lightVec, normal), 0.0); - - // Add ambient light and alpha component from diffuse texture map - gl_FragColor = vec4(material_ambient, diffuseMaterial.w); - - // compute specular lighting - mediump vec3 specularLight = vec3(texture2D(specularTexture, texCoord)); // Specular value comes from a texture - mediump float shininess = pow (max (dot (halfVec, normal), 0.0), 2.0); - - // Add diffuse light - gl_FragColor += vec4(vec3(diffuseMaterial) * material_diffuse * lamberFactor, 0.0); - - // Add specular light - gl_FragColor += vec4(material_specular * specularLight * shininess, 0.0); - */ - - //gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0); - gl_FragColor = diffuseMaterial; -} diff --git a/objview/Classes/krengine/Shaders/ObjectShader.vsh b/objview/Classes/krengine/Shaders/ObjectShader.vsh deleted file mode 100644 index cf30b5c..0000000 --- a/objview/Classes/krengine/Shaders/ObjectShader.vsh +++ /dev/null @@ -1,171 +0,0 @@ -// -// Shader.vsh -// gldemo -// -// Created by Kearwood Gilbert on 10-09-16. -// Copyright (c) 2010 Kearwood Software. All rights reserved. -// -/* - - // -- Per vertex lighting - - attribute highp vec3 myVertex, myNormal; - attribute mediump vec2 myUV; - uniform mediump mat4 myMVPMatrix, myModelView; // mvpmatrix is the result of multiplying the model, view, and projection matrices - uniform mediump mat3 myModelViewIT; - uniform mediump vec3 material_ambient, material_diffuse, material_specular; - - varying mediump vec2 texCoord; - varying mediump vec3 diffuse, specular; - varying mediump vec3 normal; - const mediump float shininess = 4.0; - const mediump float cutoff = 0.975, exp = 100.0; - const mediump vec3 LightPos = vec3(20.0, 00.0, 10.0); - const mediump vec3 LightCol = vec3(2.0,2.0,2.0); - - //directional light function // - // spFlg flag using specular or not. - // nrml nrml vector in the eye coordinate. - // ePos vertex position in the eye coordinate. - void DirectionalLight(in mediump int spFlg, in mediump vec3 nrml, in mediump vec3 ePos){ - // calculate the light direction vector. - mediump vec3 lightDir = normalize(LightPos); - // calculate the half vector between eye position and light position. - mediump vec3 halfV = normalize(-ePos + LightPos); - // calculate diffuse light intensity. - mediump float dVP = max(dot(nrml,lightDir), 0.0); - // calculate approximated specular light base intensity. - mediump float dHV = max(dot(nrml,halfV),0.0); - // if the diffuse is not zero and spFlg is On, - // calculate specular light intensity with shininess, - // or turn off the specular light. - mediump float pf; - if (dVP>.0 && spFlg==1) pf = pow(dHV, shininess); - else pf = 0.0; - diffuse += dVP*LightCol; - specular += pf*LightCol; - } - - // main function // - void main(void){ - // transform the normal vector from the model coordinate to the eye coordinate. - normal = normalize(myModelViewIT * myNormal); - // calculate the vertex position in the eye coordinate. - highp vec3 ePos = vec3(myModelView * vec4(myVertex,1.0)); - // initalize light intensity parameter. - //diffuse = material_ambient; - diffuse = vec3(0.75); - - specular = vec3(0.0); - - DirectionalLight(1, normal, ePos); - - specular *= material_specular; - - diffuse = diffuse * material_diffuse + material_ambient; - - - // Transform position - gl_Position = myMVPMatrix * vec4(myVertex,1.0); - // Pass UV co-ordinates - texCoord = myUV.st; - } - -*/ - -/* - - // -- Per Pixel lighting, test 1 -- - -attribute highp vec3 myVertex, myNormal, myTangent; -attribute mediump vec2 myUV; -uniform mediump mat4 myMVPMatrix, myModelView; // mvpmatrix is the result of multiplying the model, view, and projection matrices -uniform mediump mat3 myModelViewIT; -uniform mediump vec3 material_ambient, material_diffuse, material_specular; - -varying mediump vec2 texCoord; -varying mediump vec3 normal; -varying mediump vec3 ePos; - - -// main function // -void main(void){ - // Transform position - gl_Position = myMVPMatrix * vec4(myVertex,1.0); - // Pass UV co-ordinates - texCoord = myUV.st; - - // transform the normal vector from the model coordinate to the eye coordinate. - normal = normalize(myModelViewIT * myNormal); - - // calculate the vertex position in the eye coordinate. - ePos = vec3(myModelView * vec4(myVertex,1.0)); - - //mat_ambient = material_ambient; - //mat_diffuse = material_diffuse; - //mat_specular = material_specular; -} - -*/ - - -// -- Per Pixel lighting, test 2 -- - -const mediump vec3 LightPos = vec3(40, 20.0, -90.0); - -attribute highp vec3 myVertex, myNormal; -attribute highp vec3 myTangent; -attribute mediump vec2 myUV; -uniform highp mat4 myMVPMatrix, myModelView; // mvpmatrix is the result of multiplying the model, view, and projection matrices -uniform highp mat3 myModelViewIT; -uniform lowp vec3 material_ambient, material_diffuse, material_specular; - -varying mediump vec2 texCoord; -/* -varying mediump vec3 lightVec; -varying mediump vec3 halfVec; -*/ - - -//varying mediump vec3 eyeVec; - -void main() -{ - // Transform position - gl_Position = myMVPMatrix * vec4(myVertex,1.0); - - // Pass UV co-ordinates - texCoord = myUV.st; - - /* - - // Building the matrix Eye Space -> Tangent Space - vec3 n = normalize(vec3(myModelView * vec4(myNormal, 1.0))); - vec3 t = normalize(vec3(myModelView * vec4(myTangent, 1.0))); - vec3 b = cross(n, t); - - vec3 vertexPosition = vec3(myMVPMatrix * vec4(myVertex, 1.0)); - vec3 lightDir = normalize(LightPos - vertexPosition); - - // transform light and half angle vectors by tangent basis - vec3 v; - v.x = dot(lightDir, t); - v.y = dot(lightDir, b); - v.z = dot(lightDir, n); - lightVec = normalize(v); - -// v.x = dot(vertexPosition, t); -// v.y = dot(vertexPosition, b); -// v.z = dot(vertexPosition, n); -// eyeVec = normalize(v); - - vertexPosition = normalize(vertexPosition); - - // Normalize the halfVector to pass it to the fragment shader - vec3 halfVector = normalize((vertexPosition + lightDir) / 2.0); - v.x = dot (halfVector, t); - v.y = dot (halfVector, b); - v.z = dot (halfVector, n); - halfVec = normalize (v); - */ -} diff --git a/objview/Classes/krengine/Shaders/PostShader.fsh b/objview/Classes/krengine/Shaders/PostShader.fsh deleted file mode 100644 index c86ef29..0000000 --- a/objview/Classes/krengine/Shaders/PostShader.fsh +++ /dev/null @@ -1,150 +0,0 @@ -#define DOF_QUALITY 0 -#define ENABLE_VIDEO_BG 0 -#define PIXEL_SHIFT_1 0.001 -#define PIXEL_SHIFT_2 0.002 -#define PIXEL_SHIFT_3 0.003 -#define PIXEL_SHIFT_4 0.004 - - -varying mediump vec2 textureCoordinate; -precision lowp float; - -#if ENABLE_VIDEO_BG == 0 -uniform lowp sampler2D videoFrame; -#endif - -uniform lowp sampler2D renderFrame; -uniform lowp sampler2D depthFrame; - -void main() -{ - - lowp vec4 renderColor = texture2D(renderFrame, textureCoordinate); - mediump float depth = texture2D(depthFrame, textureCoordinate).r; - - mediump vec4 pixelColor = renderColor; - - -#if DOF_QUALITY == 2 - - // Render high quality circle of confusion - // __XXX__ - // _XXXXX_ - // _XXXXX_ - // _XXXXX_ - // __XXX__ - mediump float cf1 = PIXEL_SHIFT_1; - mediump float cf2 = PIXEL_SHIFT_2; - - mediump float bx1 = textureCoordinate.s + cf1; - mediump float bx2 = textureCoordinate.s + cf2; - mediump float bxm1 = textureCoordinate.s - cf1; - mediump float bxm2 = textureCoordinate.s - cf2; - - mediump float by1 = textureCoordinate.t + cf1; - mediump float by2 = textureCoordinate.t + cf2; - mediump float bym1 = textureCoordinate.t - cf1; - mediump float bym2 = textureCoordinate.t - cf2; - - pixelColor += texture2D(renderFrame, vec2(bx1, textureCoordinate.t)); - pixelColor += texture2D(renderFrame, vec2(bxm1, textureCoordinate.t)); - pixelColor += texture2D(renderFrame, vec2(bx2, textureCoordinate.t)); - pixelColor += texture2D(renderFrame, vec2(bxm2, textureCoordinate.t)); - - pixelColor += texture2D(renderFrame, vec2(textureCoordinate.s, by1)); - pixelColor += texture2D(renderFrame, vec2(bx1, by1)); - pixelColor += texture2D(renderFrame, vec2(bxm1, by1)); - pixelColor += texture2D(renderFrame, vec2(bx2, by1)); - pixelColor += texture2D(renderFrame, vec2(bxm2, by1)); - - pixelColor += texture2D(renderFrame, vec2(textureCoordinate.s, by2)); - pixelColor += texture2D(renderFrame, vec2(bx1, by2)); - pixelColor += texture2D(renderFrame, vec2(bxm1, by2)); - - pixelColor += texture2D(renderFrame, vec2(textureCoordinate.s,bym1)); - pixelColor += texture2D(renderFrame, vec2(bx1,bym1)); - pixelColor += texture2D(renderFrame, vec2(bxm1,bym1)); - pixelColor += texture2D(renderFrame, vec2(bx2,bym1)); - pixelColor += texture2D(renderFrame, vec2(bxm2,bym1)); - - pixelColor += texture2D(renderFrame, vec2(bx1, bym2)); - pixelColor += texture2D(renderFrame, vec2(bx1, bym2)); - pixelColor += texture2D(renderFrame, vec2(bxm1, bym2)); - pixelColor /= 21.0; - -#endif -// DOF_QUALITY == 2 - -#if DOF_QUALITY == 1 - - // Render low quality circle of confusion - // ___X___ - // __XXX__ - // _XXXXX_ - // __XXX__ - // ___X___ - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(0, -PIXEL_SHIFT_2)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(-PIXEL_SHIFT_1, -PIXEL_SHIFT_1)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(0, -PIXEL_SHIFT_1)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(+PIXEL_SHIFT_1, -PIXEL_SHIFT_1)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(-PIXEL_SHIFT_2, 0)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(-PIXEL_SHIFT_1, 0)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(+PIXEL_SHIFT_1, 0)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(+PIXEL_SHIFT_2, 0)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(-PIXEL_SHIFT_1, -PIXEL_SHIFT_1)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(0, -PIXEL_SHIFT_1)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(+PIXEL_SHIFT_1, -PIXEL_SHIFT_1)); - pixelColor += texture2D(renderFrame, textureCoordinate + vec2(0, -PIXEL_SHIFT_2)); - pixelColor /= 13.0; - -#endif -// DOF_QUALITY == 1 - -#if DOF_QUALITY > 0 - mediump float focusDepth = texture2D(depthFrame, vec2(0.5, 0.5)).r; - mediump float blurAmount = clamp((depth - focusDepth) * 10.0, 0.0, 1.0); - pixelColor = pixelColor * blurAmount + renderColor * (1.0 - blurAmount); -#endif - - // ---- DEPTH_OF_FIELD END ---- - - - - - // ---- NIGHT_TIME START ---- - - // Un-comment to enable night time / flash effect - // pixelColor *= 1.0 - clamp((depth - 0.7) * 2.0, 0.0, 1.0); - - // ---- NIGHT_TIME END ---- - - // ---- VIDEO_BG START ---- - - /* - // Overlay video background - if(depth == 1.0) { - //FILTER COLOR BY CALCULATING PER PIXEL DOT PRODUCT - pixelColor = vec4(dot(vec3(texture2D(videoFrame, textureCoordinate)), vec3(.222, .707, .071))); - } - */ - - // ---- VIDEO_BG END ---- - - - // ---- VIGNETTE START ---- - - // Render vignette effect - - // pixelColor *= 1.0 - clamp((distance(textureCoordinate, vec2(0.5, 0.5)) - 0.4), 0.0, 1.0); - - // ---- VIGNETTE END ---- - - gl_FragColor = pixelColor; - - - //PASSTHROUGH STATEMENT - // gl_FragColor = texture2D(depthFrame, textureCoordinate); - - //gl_FragColor = vec4(vec3(blurAmount), 1.0); - -} diff --git a/objview/Classes/krengine/Shaders/PostShader.vsh b/objview/Classes/krengine/Shaders/PostShader.vsh deleted file mode 100644 index 6121696..0000000 --- a/objview/Classes/krengine/Shaders/PostShader.vsh +++ /dev/null @@ -1,10 +0,0 @@ -attribute vec4 position; -attribute lowp vec4 inputTextureCoordinate; - -varying mediump vec2 textureCoordinate; - -void main() -{ - gl_Position = position; - textureCoordinate = inputTextureCoordinate.xy; -} \ No newline at end of file diff --git a/objview/Classes/krengine/Shaders/ShadowShader.fsh b/objview/Classes/krengine/Shaders/ShadowShader.fsh deleted file mode 100644 index c223ed3..0000000 --- a/objview/Classes/krengine/Shaders/ShadowShader.fsh +++ /dev/null @@ -1,35 +0,0 @@ -// -- Per Pixel lighting, test 3 -- -uniform sampler2D diffuseTexture, specularTexture, normalTexture; -varying mediump vec2 texCoord; -varying mediump vec3 lightVec; -varying mediump vec3 halfVec; -uniform lowp vec3 material_ambient, material_diffuse, material_specular; - -void main() -{ - // compute diffuse lighting - mediump vec4 diffuseMaterial = texture2D(diffuseTexture, texCoord); - - /* - // lookup normal from normal map, move from [0,1] to [-1, 1] range, normalize - mediump vec3 normal = normalize(2.0 * texture2D(normalTexture,texCoord).rgb - 1.0); - - mediump float lamberFactor= max (dot (lightVec, normal), 0.0); - - // Add ambient light and alpha component from diffuse texture map - gl_FragColor = vec4(material_ambient, diffuseMaterial.w); - - // compute specular lighting - mediump vec3 specularLight = vec3(texture2D(specularTexture, texCoord)); // Specular value comes from a texture - mediump float shininess = pow (max (dot (halfVec, normal), 0.0), 2.0); - - // Add diffuse light - gl_FragColor += vec4(vec3(diffuseMaterial) * material_diffuse * lamberFactor, 0.0); - - // Add specular light - gl_FragColor += vec4(material_specular * specularLight * shininess, 0.0); - */ - - //gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0); - gl_FragColor = diffuseMaterial; -} \ No newline at end of file diff --git a/objview/Classes/krengine/Shaders/ShadowShader.vsh b/objview/Classes/krengine/Shaders/ShadowShader.vsh deleted file mode 100644 index 4633925..0000000 --- a/objview/Classes/krengine/Shaders/ShadowShader.vsh +++ /dev/null @@ -1,58 +0,0 @@ -const mediump vec3 LightPos = vec3(40, 20.0, -90.0); - -attribute highp vec3 myVertex, myNormal; -attribute highp vec3 myTangent; -attribute mediump vec2 myUV; -uniform highp mat4 myMVPMatrix, myModelView; // mvpmatrix is the result of multiplying the model, view, and projection matrices -uniform highp mat3 myModelViewIT; -uniform lowp vec3 material_ambient, material_diffuse, material_specular; - -varying mediump vec2 texCoord; -/* - varying mediump vec3 lightVec; - varying mediump vec3 halfVec; - */ - - -//varying mediump vec3 eyeVec; - -void main() -{ - // Transform position - gl_Position = myMVPMatrix * vec4(myVertex,1.0); - - // Pass UV co-ordinates - texCoord = myUV.st; - - /* - - // Building the matrix Eye Space -> Tangent Space - vec3 n = normalize(vec3(myModelView * vec4(myNormal, 1.0))); - vec3 t = normalize(vec3(myModelView * vec4(myTangent, 1.0))); - vec3 b = cross(n, t); - - vec3 vertexPosition = vec3(myMVPMatrix * vec4(myVertex, 1.0)); - vec3 lightDir = normalize(LightPos - vertexPosition); - - // transform light and half angle vectors by tangent basis - vec3 v; - v.x = dot(lightDir, t); - v.y = dot(lightDir, b); - v.z = dot(lightDir, n); - lightVec = normalize(v); - - // v.x = dot(vertexPosition, t); - // v.y = dot(vertexPosition, b); - // v.z = dot(vertexPosition, n); - // eyeVec = normalize(v); - - vertexPosition = normalize(vertexPosition); - - // Normalize the halfVector to pass it to the fragment shader - vec3 halfVector = normalize((vertexPosition + lightDir) / 2.0); - v.x = dot (halfVector, t); - v.y = dot (halfVector, b); - v.z = dot (halfVector, n); - halfVec = normalize (v); - */ -} \ No newline at end of file diff --git a/objview/KRObjView-Info.plist b/objview/KRObjView-Info.plist deleted file mode 100644 index 9c6fc87..0000000 --- a/objview/KRObjView-Info.plist +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.kearwood.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - UIFileSharingEnabled - - UIMainStoryboardFile - Storyboard - UIMainStoryboardFile~ipad - Storyboard-ipad - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeLeft - - - diff --git a/objview/KRObjView.xcodeproj/applemac.mode1v3 b/objview/KRObjView.xcodeproj/applemac.mode1v3 deleted file mode 100644 index fdbec79..0000000 --- a/objview/KRObjView.xcodeproj/applemac.mode1v3 +++ /dev/null @@ -1,1442 +0,0 @@ - - - - - ActivePerspectiveName - Project - AllowedModules - - - BundleLoadPath - - MaxInstances - n - Module - PBXSmartGroupTreeModule - Name - Groups and Files Outline View - - - BundleLoadPath - - MaxInstances - n - Module - PBXNavigatorGroup - Name - Editor - - - BundleLoadPath - - MaxInstances - n - Module - XCTaskListModule - Name - Task List - - - BundleLoadPath - - MaxInstances - n - Module - XCDetailModule - Name - File and Smart Group Detail Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXBuildResultsModule - Name - Detailed Build Results Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXProjectFindModule - Name - Project Batch Find Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCProjectFormatConflictsModule - Name - Project Format Conflicts List - - - BundleLoadPath - - MaxInstances - n - Module - PBXBookmarksModule - Name - Bookmarks Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXClassBrowserModule - Name - Class Browser - - - BundleLoadPath - - MaxInstances - n - Module - PBXCVSModule - Name - Source Code Control Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXDebugBreakpointsModule - Name - Debug Breakpoints Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCDockableInspector - Name - Inspector - - - BundleLoadPath - - MaxInstances - n - Module - PBXOpenQuicklyModule - Name - Open Quickly Tool - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugSessionModule - Name - Debugger - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugCLIModule - Name - Debug Console - - - BundleLoadPath - - MaxInstances - n - Module - XCSnapshotModule - Name - Snapshots Tool - - - BundlePath - /Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources - Description - DefaultDescriptionKey - DockingSystemVisible - - Extension - mode1v3 - FavBarConfig - - PBXProjectModuleGUID - 1063FCC4136D865B00EE555B - XCBarModuleItemNames - - XCBarModuleItems - - - FirstTimeWindowDisplayed - - Identifier - com.apple.perspectives.project.mode1v3 - MajorVersion - 33 - MinorVersion - 0 - Name - Default - Notifications - - - XCObserverAutoDisconnectKey - - XCObserverDefintionKey - - PBXStatusErrorsKey - 0 - - XCObserverFactoryKey - XCPerspectivesSpecificationIdentifier - XCObserverGUIDKey - XCObserverProjectIdentifier - XCObserverNotificationKey - PBXStatusBuildStateMessageNotification - XCObserverTargetKey - XCMainBuildResultsModuleGUID - XCObserverTriggerKey - awakenModuleWithObserver: - XCObserverValidationKey - - PBXStatusErrorsKey - 2 - - - - OpenEditors - - PerspectiveWidths - - -1 - -1 - - Perspectives - - - ChosenToolbarItems - - active-combo-popup - action - NSToolbarFlexibleSpaceItem - debugger-enable-breakpoints - clean - build - com.apple.ide.PBXToolbarStopButton - get-info - toggle-editor - NSToolbarFlexibleSpaceItem - com.apple.pbx.toolbar.searchfield - - ControllerClassBaseName - - IconName - WindowOfProjectWithEditor - Identifier - perspective.project - IsVertical - - Layout - - - BecomeActive - - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C37FBAC04509CD000000102 - 1C37FAAC04509CD000000102 - 1C37FABC05509CD000000102 - 1C37FABC05539CD112110102 - E2644B35053B69B200211256 - 1C37FABC04509CD000100104 - 1CC0EA4004350EF90044410B - 1CC0EA4004350EF90041110B - - PBXProjectModuleGUID - 1CE0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - yes - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 294 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 29B97314FDCFA39411CA2CEA - 080E96DDFE201D6D7F000001 - 1063FC5B136D5EC200EE555B - 29B97315FDCFA39411CA2CEA - 1C37FABC05509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 7 - 1 - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {294, 705}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - - XCSharingToken - com.apple.Xcode.GFSharingToken - - GeometryConfiguration - - Frame - {{0, 0}, {311, 723}} - GroupTreeTableConfiguration - - MainColumn - 294 - - RubberWindowFrame - 62 272 1440 764 0 0 1920 1058 - - Module - PBXSmartGroupTreeModule - Proportion - 311pt - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CE0B20306471E060097A5F4 - PBXProjectModuleLabel - KRObjViewGLView.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CE0B20406471E060097A5F4 - PBXProjectModuleLabel - KRObjViewGLView.m - _historyCapacity - 0 - bookmark - 1063FD44136E8D0C00EE555B - history - - 1063FCAF136D865B00EE555B - 1063FCB0136D865B00EE555B - 1063FCB2136D865B00EE555B - 1063FCB6136D865B00EE555B - 1063FD3A136E8D0C00EE555B - 1063FD3B136E8D0C00EE555B - 1063FD3C136E8D0C00EE555B - 1063FD3D136E8D0C00EE555B - 1063FD3E136E8D0C00EE555B - 1063FD3F136E8D0C00EE555B - 1063FD40136E8D0C00EE555B - 1063FD41136E8D0C00EE555B - 1063FD42136E8D0C00EE555B - 1063FD43136E8D0C00EE555B - - - SplitCount - 1 - - StatusBarVisibility - - - GeometryConfiguration - - Frame - {{0, 0}, {1124, 718}} - RubberWindowFrame - 62 272 1440 764 0 0 1920 1058 - - Module - PBXNavigatorGroup - Proportion - 718pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CE0B20506471E060097A5F4 - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{0, 723}, {1124, 0}} - RubberWindowFrame - 62 272 1440 764 0 0 1920 1058 - - Module - XCDetailModule - Proportion - 0pt - - - Proportion - 1124pt - - - Name - Project - ServiceClasses - - XCModuleDock - PBXSmartGroupTreeModule - XCModuleDock - PBXNavigatorGroup - XCDetailModule - - TableOfContents - - 1063FCC2136D865B00EE555B - 1CE0B1FE06471DED0097A5F4 - 1063FCC3136D865B00EE555B - 1CE0B20306471E060097A5F4 - 1CE0B20506471E060097A5F4 - - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarConfiguration - xcode.toolbar.config.defaultV3 - - - ControllerClassBaseName - - IconName - WindowOfProject - Identifier - perspective.morph - IsVertical - 0 - Layout - - - BecomeActive - 1 - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C37FBAC04509CD000000102 - 1C37FAAC04509CD000000102 - 1C08E77C0454961000C914BD - 1C37FABC05509CD000000102 - 1C37FABC05539CD112110102 - E2644B35053B69B200211256 - 1C37FABC04509CD000100104 - 1CC0EA4004350EF90044410B - 1CC0EA4004350EF90041110B - - PBXProjectModuleGUID - 11E0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - yes - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 186 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 29B97314FDCFA39411CA2CEA - 1C37FABC05509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 337}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - 1 - XCSharingToken - com.apple.Xcode.GFSharingToken - - GeometryConfiguration - - Frame - {{0, 0}, {203, 355}} - GroupTreeTableConfiguration - - MainColumn - 186 - - RubberWindowFrame - 373 269 690 397 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 100% - - - Name - Morph - PreferredWidth - 300 - ServiceClasses - - XCModuleDock - PBXSmartGroupTreeModule - - TableOfContents - - 11E0B1FE06471DED0097A5F4 - - ToolbarConfiguration - xcode.toolbar.config.default.shortV3 - - - PerspectivesBarVisible - - ShelfIsVisible - - SourceDescription - file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec' - StatusbarIsVisible - - TimeStamp - 326012172.37813801 - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarDisplayMode - 1 - ToolbarIsVisible - - ToolbarSizeMode - 2 - Type - Perspectives - UpdateMessage - The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'? - WindowJustification - 5 - WindowOrderList - - 1063FCC5136D865B00EE555B - 1063FCC6136D865B00EE555B - 1C78EAAD065D492600B07095 - 1CD10A99069EF8BA00B06720 - 1063FBD2136BA3B000EE555B - /Users/applemac/Desktop/KRObjView/KRObjView.xcodeproj - - WindowString - 62 272 1440 764 0 0 1920 1058 - WindowToolsV3 - - - FirstTimeWindowDisplayed - - Identifier - windowTool.build - IsVertical - - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528F0623707200166675 - PBXProjectModuleLabel - KRObjViewViewController.m - StatusBarVisibility - - - GeometryConfiguration - - Frame - {{0, 0}, {831, 237}} - RubberWindowFrame - 42 493 831 519 0 0 1920 1058 - - Module - PBXNavigatorGroup - Proportion - 237pt - - - BecomeActive - - ContentConfiguration - - PBXProjectModuleGUID - XCMainBuildResultsModuleGUID - PBXProjectModuleLabel - Build Results - XCBuildResultsTrigger_Collapse - 1021 - XCBuildResultsTrigger_Open - 1012 - - GeometryConfiguration - - Frame - {{0, 242}, {831, 236}} - RubberWindowFrame - 42 493 831 519 0 0 1920 1058 - - Module - PBXBuildResultsModule - Proportion - 236pt - - - Proportion - 478pt - - - Name - Build Results - ServiceClasses - - PBXBuildResultsModule - - StatusbarIsVisible - - TableOfContents - - 1063FBD2136BA3B000EE555B - 1063FBD3136BA3B000EE555B - 1CD0528F0623707200166675 - XCMainBuildResultsModuleGUID - - ToolbarConfiguration - xcode.toolbar.config.buildV3 - WindowContentMinSize - 486 300 - WindowString - 42 493 831 519 0 0 1920 1058 - WindowToolGUID - 1063FBD2136BA3B000EE555B - WindowToolIsVisible - - - - FirstTimeWindowDisplayed - - Identifier - windowTool.debugger - IsVertical - - Layout - - - Dock - - - ContentConfiguration - - Debugger - - HorizontalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {316, 185}} - {{316, 0}, {378, 185}} - - - VerticalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {694, 185}} - {{0, 185}, {694, 196}} - - - - LauncherConfigVersion - 8 - PBXProjectModuleGUID - 1C162984064C10D400B95A72 - PBXProjectModuleLabel - Debug - GLUTExamples (Underwater) - - GeometryConfiguration - - DebugConsoleVisible - None - DebugConsoleWindowFrame - {{200, 200}, {500, 300}} - DebugSTDIOWindowFrame - {{200, 200}, {500, 300}} - Frame - {{0, 0}, {694, 381}} - PBXDebugSessionStackFrameViewKey - - DebugVariablesTableConfiguration - - Name - 120 - Value - 85 - Summary - 148 - - Frame - {{316, 0}, {378, 185}} - RubberWindowFrame - 63 590 694 422 0 0 1920 1058 - - RubberWindowFrame - 63 590 694 422 0 0 1920 1058 - - Module - PBXDebugSessionModule - Proportion - 381pt - - - Proportion - 381pt - - - Name - Debugger - ServiceClasses - - PBXDebugSessionModule - - StatusbarIsVisible - - TableOfContents - - 1CD10A99069EF8BA00B06720 - 1063FBD4136BA3B000EE555B - 1C162984064C10D400B95A72 - 1063FBD5136BA3B000EE555B - 1063FBD6136BA3B000EE555B - 1063FBD7136BA3B000EE555B - 1063FBD8136BA3B000EE555B - 1063FBD9136BA3B000EE555B - - ToolbarConfiguration - xcode.toolbar.config.debugV3 - WindowString - 63 590 694 422 0 0 1920 1058 - WindowToolGUID - 1CD10A99069EF8BA00B06720 - WindowToolIsVisible - - - - Identifier - windowTool.find - Layout - - - Dock - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CDD528C0622207200134675 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CD0528D0623707200166675 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {781, 167}} - RubberWindowFrame - 62 385 781 470 0 0 1440 878 - - Module - PBXNavigatorGroup - Proportion - 781pt - - - Proportion - 50% - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528E0623707200166675 - PBXProjectModuleLabel - Project Find - - GeometryConfiguration - - Frame - {{8, 0}, {773, 254}} - RubberWindowFrame - 62 385 781 470 0 0 1440 878 - - Module - PBXProjectFindModule - Proportion - 50% - - - Proportion - 428pt - - - Name - Project Find - ServiceClasses - - PBXProjectFindModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C530D57069F1CE1000CFCEE - 1C530D58069F1CE1000CFCEE - 1C530D59069F1CE1000CFCEE - 1CDD528C0622207200134675 - 1C530D5A069F1CE1000CFCEE - 1CE0B1FE06471DED0097A5F4 - 1CD0528E0623707200166675 - - WindowString - 62 385 781 470 0 0 1440 878 - WindowToolGUID - 1C530D57069F1CE1000CFCEE - WindowToolIsVisible - 0 - - - Identifier - MENUSEPARATOR - - - FirstTimeWindowDisplayed - - Identifier - windowTool.debuggerConsole - IsVertical - - Layout - - - Dock - - - BecomeActive - - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAAC065D492600B07095 - PBXProjectModuleLabel - Debugger Console - - GeometryConfiguration - - Frame - {{0, 0}, {650, 209}} - RubberWindowFrame - 63 762 650 250 0 0 1920 1058 - - Module - PBXDebugCLIModule - Proportion - 209pt - - - Proportion - 209pt - - - Name - Debugger Console - ServiceClasses - - PBXDebugCLIModule - - StatusbarIsVisible - - TableOfContents - - 1C78EAAD065D492600B07095 - 1063FBDA136BA3B000EE555B - 1C78EAAC065D492600B07095 - - ToolbarConfiguration - xcode.toolbar.config.consoleV3 - WindowString - 63 762 650 250 0 0 1920 1058 - WindowToolGUID - 1C78EAAD065D492600B07095 - WindowToolIsVisible - - - - Identifier - windowTool.snapshots - Layout - - - Dock - - - Module - XCSnapshotModule - Proportion - 100% - - - Proportion - 100% - - - Name - Snapshots - ServiceClasses - - XCSnapshotModule - - StatusbarIsVisible - Yes - ToolbarConfiguration - xcode.toolbar.config.snapshots - WindowString - 315 824 300 550 0 0 1440 878 - WindowToolIsVisible - Yes - - - Identifier - windowTool.scm - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAB2065D492600B07095 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1C78EAB3065D492600B07095 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {452, 0}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - - Module - PBXNavigatorGroup - Proportion - 0pt - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1CD052920623707200166675 - PBXProjectModuleLabel - SCM - - GeometryConfiguration - - ConsoleFrame - {{0, 259}, {452, 0}} - Frame - {{0, 7}, {452, 259}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - TableConfiguration - - Status - 30 - FileName - 199 - Path - 197.0950012207031 - - TableFrame - {{0, 0}, {452, 250}} - - Module - PBXCVSModule - Proportion - 262pt - - - Proportion - 266pt - - - Name - SCM - ServiceClasses - - PBXCVSModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C78EAB4065D492600B07095 - 1C78EAB5065D492600B07095 - 1C78EAB2065D492600B07095 - 1CD052920623707200166675 - - ToolbarConfiguration - xcode.toolbar.config.scm - WindowString - 743 379 452 308 0 0 1280 1002 - - - Identifier - windowTool.breakpoints - IsVertical - 0 - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C77FABC04509CD000000102 - - PBXProjectModuleGUID - 1CE0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - no - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 168 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 1C77FABC04509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {168, 350}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - 0 - - GeometryConfiguration - - Frame - {{0, 0}, {185, 368}} - GroupTreeTableConfiguration - - MainColumn - 168 - - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 185pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CA1AED706398EBD00589147 - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{190, 0}, {554, 368}} - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - XCDetailModule - Proportion - 554pt - - - Proportion - 368pt - - - MajorVersion - 3 - MinorVersion - 0 - Name - Breakpoints - ServiceClasses - - PBXSmartGroupTreeModule - XCDetailModule - - StatusbarIsVisible - 1 - TableOfContents - - 1CDDB66807F98D9800BB5817 - 1CDDB66907F98D9800BB5817 - 1CE0B1FE06471DED0097A5F4 - 1CA1AED706398EBD00589147 - - ToolbarConfiguration - xcode.toolbar.config.breakpointsV3 - WindowString - 315 424 744 409 0 0 1440 878 - WindowToolGUID - 1CDDB66807F98D9800BB5817 - WindowToolIsVisible - 1 - - - Identifier - windowTool.debugAnimator - Layout - - - Dock - - - Module - PBXNavigatorGroup - Proportion - 100% - - - Proportion - 100% - - - Name - Debug Visualizer - ServiceClasses - - PBXNavigatorGroup - - StatusbarIsVisible - 1 - ToolbarConfiguration - xcode.toolbar.config.debugAnimatorV3 - WindowString - 100 100 700 500 0 0 1280 1002 - - - Identifier - windowTool.bookmarks - Layout - - - Dock - - - Module - PBXBookmarksModule - Proportion - 100% - - - Proportion - 100% - - - Name - Bookmarks - ServiceClasses - - PBXBookmarksModule - - StatusbarIsVisible - 0 - WindowString - 538 42 401 187 0 0 1280 1002 - - - Identifier - windowTool.projectFormatConflicts - Layout - - - Dock - - - Module - XCProjectFormatConflictsModule - Proportion - 100% - - - Proportion - 100% - - - Name - Project Format Conflicts - ServiceClasses - - XCProjectFormatConflictsModule - - StatusbarIsVisible - 0 - WindowContentMinSize - 450 300 - WindowString - 50 850 472 307 0 0 1440 877 - - - Identifier - windowTool.classBrowser - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - OptionsSetName - Hierarchy, all classes - PBXProjectModuleGUID - 1CA6456E063B45B4001379D8 - PBXProjectModuleLabel - Class Browser - NSObject - - GeometryConfiguration - - ClassesFrame - {{0, 0}, {374, 96}} - ClassesTreeTableConfiguration - - PBXClassNameColumnIdentifier - 208 - PBXClassBookColumnIdentifier - 22 - - Frame - {{0, 0}, {630, 331}} - MembersFrame - {{0, 105}, {374, 395}} - MembersTreeTableConfiguration - - PBXMemberTypeIconColumnIdentifier - 22 - PBXMemberNameColumnIdentifier - 216 - PBXMemberTypeColumnIdentifier - 97 - PBXMemberBookColumnIdentifier - 22 - - PBXModuleWindowStatusBarHidden2 - 1 - RubberWindowFrame - 385 179 630 352 0 0 1440 878 - - Module - PBXClassBrowserModule - Proportion - 332pt - - - Proportion - 332pt - - - Name - Class Browser - ServiceClasses - - PBXClassBrowserModule - - StatusbarIsVisible - 0 - TableOfContents - - 1C0AD2AF069F1E9B00FABCE6 - 1C0AD2B0069F1E9B00FABCE6 - 1CA6456E063B45B4001379D8 - - ToolbarConfiguration - xcode.toolbar.config.classbrowser - WindowString - 385 179 630 352 0 0 1440 878 - WindowToolGUID - 1C0AD2AF069F1E9B00FABCE6 - WindowToolIsVisible - 0 - - - Identifier - windowTool.refactoring - IncludeInToolsMenu - 0 - Layout - - - Dock - - - BecomeActive - 1 - GeometryConfiguration - - Frame - {0, 0}, {500, 335} - RubberWindowFrame - {0, 0}, {500, 335} - - Module - XCRefactoringModule - Proportion - 100% - - - Proportion - 100% - - - Name - Refactoring - ServiceClasses - - XCRefactoringModule - - WindowString - 200 200 500 356 0 0 1920 1200 - - - - diff --git a/objview/KRObjView.xcodeproj/project.pbxproj b/objview/KRObjView.xcodeproj/project.pbxproj deleted file mode 100644 index f23ac39..0000000 --- a/objview/KRObjView.xcodeproj/project.pbxproj +++ /dev/null @@ -1,497 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 1063FBAC136BA13F00EE555B /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1063FBAB136BA13F00EE555B /* CoreMedia.framework */; }; - 1063FBAE136BA13F00EE555B /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1063FBAD136BA13F00EE555B /* CoreVideo.framework */; }; - 1063FBB0136BA13F00EE555B /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1063FBAF136BA13F00EE555B /* OpenGLES.framework */; }; - 1063FBB2136BA13F00EE555B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1063FBB1136BA13F00EE555B /* QuartzCore.framework */; }; - 1063FC77136D6A1B00EE555B /* KRObjViewGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1063FC76136D6A1B00EE555B /* KRObjViewGLView.mm */; }; - 1D3623260D0F684500981E51 /* KRObjViewAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* KRObjViewAppDelegate.mm */; }; - 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; - 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; - 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; - 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; - 28D7ACF80DDB3853001CB0EB /* KRObjViewViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* KRObjViewViewController.mm */; }; - E430D08C15F88BC50010558D /* occlusion_test.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E430D08A15F88B950010558D /* occlusion_test.vsh */; }; - E430D08D15F88BC70010558D /* occlusion_test.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E430D08515F88A9F0010558D /* occlusion_test.fsh */; }; - E43A7A6E13CA2BA2000A565E /* libKREngine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E43A7A6D13CA2BA2000A565E /* libKREngine.a */; }; - E46FED2D13C9A49F009F5814 /* ShadowShader.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2113C9A488009F5814 /* ShadowShader.vsh */; }; - E46FED2E13C9A49F009F5814 /* ShadowShader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2213C9A488009F5814 /* ShadowShader.fsh */; }; - E46FED2F13C9A49F009F5814 /* PostShader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2313C9A488009F5814 /* PostShader.fsh */; }; - E46FED3013C9A49F009F5814 /* ObjectShader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2413C9A488009F5814 /* ObjectShader.fsh */; }; - E46FED3113C9A49F009F5814 /* ObjectShader.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2513C9A488009F5814 /* ObjectShader.vsh */; }; - E46FED3213C9A49F009F5814 /* PostShader.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2613C9A488009F5814 /* PostShader.vsh */; }; - E4769DF3158A7915004B83AC /* flare.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E4769DF1158A7915004B83AC /* flare.fsh */; }; - E4769DF4158A7915004B83AC /* flare.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E4769DF2158A7915004B83AC /* flare.vsh */; }; - E48278B415F037B9001C9431 /* visualize_overlay.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E48278B215F037B9001C9431 /* visualize_overlay.vsh */; }; - E48839A515F92C8D00BD66D5 /* visualize_overlay.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E48839A315F92C6900BD66D5 /* visualize_overlay.fsh */; }; - E48BB5F9160AEF16008477A6 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = E48BB5F7160AEF16008477A6 /* README.md */; }; - E48BB5FA160AEF16008477A6 /* release_notes.md in Resources */ = {isa = PBXBuildFile; fileRef = E48BB5F8160AEF16008477A6 /* release_notes.md */; }; - E48BB5FC160AF61C008477A6 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E40611D214E4E98B0065996A /* libTestFlight.a */; }; - E48BB5FE160AF8B9008477A6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E48BB5FD160AF8B9008477A6 /* libz.dylib */; }; - E49EB29C13806C5D00A4E727 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = E49EB29B13806C5D00A4E727 /* MainWindow-iPad.xib */; }; - E4A9DEC715412923009DF363 /* light_point.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E4A9DEC2154128F0009DF363 /* light_point.fsh */; }; - E4A9DEC815412923009DF363 /* light_point.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E4A9DEC515412906009DF363 /* light_point.vsh */; }; - E4BDF96A1614D7D500E24C10 /* Storyboard-ipad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */; }; - E4BDF96C1614D7EB00E24C10 /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */; }; - E4CE184A15FEEE8500F80870 /* font.pvr in Resources */ = {isa = PBXBuildFile; fileRef = E4CE184915FEEE8500F80870 /* font.pvr */; }; - E4CE185415FF12B700F80870 /* light_point_inside.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E4CE185015FF12A700F80870 /* light_point_inside.fsh */; }; - E4CE185515FF12B700F80870 /* light_point_inside.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E4CE185115FF12A700F80870 /* light_point_inside.vsh */; }; - E4FF48C51538FBF8002053FC /* light_directional.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E4FF48C01538FBF0002053FC /* light_directional.fsh */; }; - E4FF48C61538FBFC002053FC /* light_directional.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E4FF48C11538FBF0002053FC /* light_directional.vsh */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 1063FBAB136BA13F00EE555B /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; - 1063FBAD136BA13F00EE555B /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; - 1063FBAF136BA13F00EE555B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; - 1063FBB1136BA13F00EE555B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 1063FC75136D6A1B00EE555B /* KRObjViewGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KRObjViewGLView.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 1063FC76136D6A1B00EE555B /* KRObjViewGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = KRObjViewGLView.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 1D3623240D0F684500981E51 /* KRObjViewAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KRObjViewAppDelegate.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 1D3623250D0F684500981E51 /* KRObjViewAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = KRObjViewAppDelegate.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 1D6058910D05DD3D006BFB54 /* KRObjView3.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KRObjView3.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; - 28D7ACF60DDB3853001CB0EB /* KRObjViewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KRObjViewViewController.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 28D7ACF70DDB3853001CB0EB /* KRObjViewViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = KRObjViewViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = main.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - 32CA4F630368D1EE00C91783 /* KRObjView_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KRObjView_Prefix.pch; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* KRObjView-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "KRObjView-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; - E40611D214E4E98B0065996A /* libTestFlight.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libTestFlight.a; sourceTree = ""; }; - E40611D514E4E98B0065996A /* TestFlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TestFlight.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - E430D08515F88A9F0010558D /* occlusion_test.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = occlusion_test.fsh; path = ../KREngine/KREngine/Shaders/occlusion_test.fsh; sourceTree = ""; }; - E430D08A15F88B950010558D /* occlusion_test.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = occlusion_test.vsh; path = ../KREngine/KREngine/Shaders/occlusion_test.vsh; sourceTree = ""; }; - E43A7A6D13CA2BA2000A565E /* libKREngine.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libKREngine.a; sourceTree = BUILT_PRODUCTS_DIR; }; - E46FED2113C9A488009F5814 /* ShadowShader.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; lineEnding = 0; name = ShadowShader.vsh; path = ../KREngine/KREngine/Shaders/ShadowShader.vsh; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.glsl; }; - E46FED2213C9A488009F5814 /* ShadowShader.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = ShadowShader.fsh; path = ../KREngine/KREngine/Shaders/ShadowShader.fsh; sourceTree = ""; }; - E46FED2313C9A488009F5814 /* PostShader.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = PostShader.fsh; path = ../KREngine/KREngine/Shaders/PostShader.fsh; sourceTree = ""; }; - E46FED2413C9A488009F5814 /* ObjectShader.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = ObjectShader.fsh; path = ../KREngine/KREngine/Shaders/ObjectShader.fsh; sourceTree = ""; }; - E46FED2513C9A488009F5814 /* ObjectShader.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; lineEnding = 0; name = ObjectShader.vsh; path = ../KREngine/KREngine/Shaders/ObjectShader.vsh; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.glsl; }; - E46FED2613C9A488009F5814 /* PostShader.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = PostShader.vsh; path = ../KREngine/KREngine/Shaders/PostShader.vsh; sourceTree = ""; }; - E4769DF1158A7915004B83AC /* flare.fsh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; name = flare.fsh; path = ../KREngine/KREngine/Shaders/flare.fsh; sourceTree = ""; }; - E4769DF2158A7915004B83AC /* flare.vsh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; name = flare.vsh; path = ../KREngine/KREngine/Shaders/flare.vsh; sourceTree = ""; }; - E48278B215F037B9001C9431 /* visualize_overlay.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = visualize_overlay.vsh; path = ../KREngine/KREngine/Shaders/visualize_overlay.vsh; sourceTree = ""; }; - E48839A315F92C6900BD66D5 /* visualize_overlay.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = visualize_overlay.fsh; path = ../KREngine/KREngine/Shaders/visualize_overlay.fsh; sourceTree = ""; }; - E48BB5F7160AEF16008477A6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = ""; }; - E48BB5F8160AEF16008477A6 /* release_notes.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes.md; sourceTree = ""; }; - E48BB5FD160AF8B9008477A6 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - E49EB29B13806C5D00A4E727 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "iPad/MainWindow-iPad.xib"; sourceTree = ""; }; - E4A9DEC2154128F0009DF363 /* light_point.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point.fsh; path = ../KREngine/KREngine/Shaders/light_point.fsh; sourceTree = ""; }; - E4A9DEC515412906009DF363 /* light_point.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point.vsh; path = ../KREngine/KREngine/Shaders/light_point.vsh; sourceTree = ""; }; - E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "Storyboard-ipad.storyboard"; path = "iPad/Storyboard-ipad.storyboard"; sourceTree = ""; }; - E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Storyboard.storyboard; path = Assets/Storyboard.storyboard; sourceTree = ""; }; - E4CE184915FEEE8500F80870 /* font.pvr */ = {isa = PBXFileReference; lastKnownFileType = file; name = font.pvr; path = ../KREngine/KREngine/Shaders/font.pvr; sourceTree = ""; }; - E4CE185015FF12A700F80870 /* light_point_inside.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point_inside.fsh; path = ../KREngine/KREngine/Shaders/light_point_inside.fsh; sourceTree = ""; }; - E4CE185115FF12A700F80870 /* light_point_inside.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point_inside.vsh; path = ../KREngine/KREngine/Shaders/light_point_inside.vsh; sourceTree = ""; }; - E4FF48C01538FBF0002053FC /* light_directional.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_directional.fsh; path = ../KREngine/KREngine/Shaders/light_directional.fsh; sourceTree = ""; }; - E4FF48C11538FBF0002053FC /* light_directional.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_directional.vsh; path = ../KREngine/KREngine/Shaders/light_directional.vsh; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E48BB5FE160AF8B9008477A6 /* libz.dylib in Frameworks */, - E48BB5FC160AF61C008477A6 /* libTestFlight.a in Frameworks */, - E43A7A6E13CA2BA2000A565E /* libKREngine.a in Frameworks */, - 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, - 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, - 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, - 1063FBAC136BA13F00EE555B /* CoreMedia.framework in Frameworks */, - 1063FBAE136BA13F00EE555B /* CoreVideo.framework in Frameworks */, - 1063FBB0136BA13F00EE555B /* OpenGLES.framework in Frameworks */, - 1063FBB2136BA13F00EE555B /* QuartzCore.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* Classes */ = { - isa = PBXGroup; - children = ( - 1D3623240D0F684500981E51 /* KRObjViewAppDelegate.h */, - 1D3623250D0F684500981E51 /* KRObjViewAppDelegate.mm */, - 28D7ACF60DDB3853001CB0EB /* KRObjViewViewController.h */, - 28D7ACF70DDB3853001CB0EB /* KRObjViewViewController.mm */, - 1063FC75136D6A1B00EE555B /* KRObjViewGLView.h */, - 1063FC76136D6A1B00EE555B /* KRObjViewGLView.mm */, - ); - path = Classes; - sourceTree = ""; - }; - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 1D6058910D05DD3D006BFB54 /* KRObjView3.app */, - ); - name = Products; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { - isa = PBXGroup; - children = ( - E48BB5FD160AF8B9008477A6 /* libz.dylib */, - E4BBBBA31512A57800F43B5B /* libraries */, - E40611D114E4E98B0065996A /* testflight */, - 080E96DDFE201D6D7F000001 /* Classes */, - 29B97315FDCFA39411CA2CEA /* Other Sources */, - 29B97317FDCFA39411CA2CEA /* Resources */, - E49EB29A13806C5B00A4E727 /* iPad */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - ); - name = CustomTemplate; - sourceTree = ""; - }; - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 32CA4F630368D1EE00C91783 /* KRObjView_Prefix.pch */, - 29B97316FDCFA39411CA2CEA /* main.m */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - E400687C1373AB6400B3D28B /* Assets */, - 28AD733E0D9D9553002E5188 /* MainWindow.xib */, - 8D1107310486CEB800E47090 /* KRObjView-Info.plist */, - E4BDF9691614D7D500E24C10 /* Storyboard-ipad.storyboard */, - E4BDF96B1614D7EB00E24C10 /* Storyboard.storyboard */, - ); - name = Resources; - sourceTree = ""; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, - 1D30AB110D05D00D00671497 /* Foundation.framework */, - 288765A40DF7441C002DB57D /* CoreGraphics.framework */, - 1063FBAB136BA13F00EE555B /* CoreMedia.framework */, - 1063FBAD136BA13F00EE555B /* CoreVideo.framework */, - 1063FBAF136BA13F00EE555B /* OpenGLES.framework */, - 1063FBB1136BA13F00EE555B /* QuartzCore.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - E400687C1373AB6400B3D28B /* Assets */ = { - isa = PBXGroup; - children = ( - E4CE184915FEEE8500F80870 /* font.pvr */, - E46FED2013C9A472009F5814 /* Shaders */, - ); - name = Assets; - sourceTree = ""; - }; - E40611D114E4E98B0065996A /* testflight */ = { - isa = PBXGroup; - children = ( - E48BB5F7160AEF16008477A6 /* README.md */, - E48BB5F8160AEF16008477A6 /* release_notes.md */, - E40611D214E4E98B0065996A /* libTestFlight.a */, - E40611D514E4E98B0065996A /* TestFlight.h */, - ); - path = testflight; - sourceTree = ""; - }; - E46FED2013C9A472009F5814 /* Shaders */ = { - isa = PBXGroup; - children = ( - E4CE185015FF12A700F80870 /* light_point_inside.fsh */, - E4CE185115FF12A700F80870 /* light_point_inside.vsh */, - E48839A315F92C6900BD66D5 /* visualize_overlay.fsh */, - E430D08A15F88B950010558D /* occlusion_test.vsh */, - E430D08515F88A9F0010558D /* occlusion_test.fsh */, - E48278B215F037B9001C9431 /* visualize_overlay.vsh */, - E4769DF1158A7915004B83AC /* flare.fsh */, - E4769DF2158A7915004B83AC /* flare.vsh */, - E4A9DEC2154128F0009DF363 /* light_point.fsh */, - E4A9DEC515412906009DF363 /* light_point.vsh */, - E4FF48C01538FBF0002053FC /* light_directional.fsh */, - E4FF48C11538FBF0002053FC /* light_directional.vsh */, - E46FED2113C9A488009F5814 /* ShadowShader.vsh */, - E46FED2213C9A488009F5814 /* ShadowShader.fsh */, - E46FED2313C9A488009F5814 /* PostShader.fsh */, - E46FED2413C9A488009F5814 /* ObjectShader.fsh */, - E46FED2513C9A488009F5814 /* ObjectShader.vsh */, - E46FED2613C9A488009F5814 /* PostShader.vsh */, - ); - name = Shaders; - sourceTree = ""; - }; - E49EB29A13806C5B00A4E727 /* iPad */ = { - isa = PBXGroup; - children = ( - E49EB29B13806C5D00A4E727 /* MainWindow-iPad.xib */, - ); - name = iPad; - sourceTree = ""; - }; - E4BBBBA31512A57800F43B5B /* libraries */ = { - isa = PBXGroup; - children = ( - E43A7A6D13CA2BA2000A565E /* libKREngine.a */, - ); - name = libraries; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* KRObjView */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "KRObjView" */; - buildPhases = ( - 1D60588D0D05DD3D006BFB54 /* Resources */, - 1D60588E0D05DD3D006BFB54 /* Sources */, - 1D60588F0D05DD3D006BFB54 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = KRObjView; - productName = AVCapTest; - productReference = 1D6058910D05DD3D006BFB54 /* KRObjView3.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0450; - }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "KRObjView" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - en, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 1D6058900D05DD3D006BFB54 /* KRObjView */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 1D60588D0D05DD3D006BFB54 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E4CE185415FF12B700F80870 /* light_point_inside.fsh in Resources */, - E4CE185515FF12B700F80870 /* light_point_inside.vsh in Resources */, - E48839A515F92C8D00BD66D5 /* visualize_overlay.fsh in Resources */, - E4769DF3158A7915004B83AC /* flare.fsh in Resources */, - E4769DF4158A7915004B83AC /* flare.vsh in Resources */, - E4A9DEC715412923009DF363 /* light_point.fsh in Resources */, - E4A9DEC815412923009DF363 /* light_point.vsh in Resources */, - E46FED2D13C9A49F009F5814 /* ShadowShader.vsh in Resources */, - E46FED2E13C9A49F009F5814 /* ShadowShader.fsh in Resources */, - E46FED2F13C9A49F009F5814 /* PostShader.fsh in Resources */, - E46FED3013C9A49F009F5814 /* ObjectShader.fsh in Resources */, - E4FF48C51538FBF8002053FC /* light_directional.fsh in Resources */, - E4FF48C61538FBFC002053FC /* light_directional.vsh in Resources */, - E46FED3113C9A49F009F5814 /* ObjectShader.vsh in Resources */, - E46FED3213C9A49F009F5814 /* PostShader.vsh in Resources */, - E48278B415F037B9001C9431 /* visualize_overlay.vsh in Resources */, - E430D08C15F88BC50010558D /* occlusion_test.vsh in Resources */, - E430D08D15F88BC70010558D /* occlusion_test.fsh in Resources */, - 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */, - E49EB29C13806C5D00A4E727 /* MainWindow-iPad.xib in Resources */, - E4CE184A15FEEE8500F80870 /* font.pvr in Resources */, - E48BB5F9160AEF16008477A6 /* README.md in Resources */, - E48BB5FA160AEF16008477A6 /* release_notes.md in Resources */, - E4BDF96A1614D7D500E24C10 /* Storyboard-ipad.storyboard in Resources */, - E4BDF96C1614D7EB00E24C10 /* Storyboard.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 1D60588E0D05DD3D006BFB54 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 1D60589B0D05DD56006BFB54 /* main.m in Sources */, - 1D3623260D0F684500981E51 /* KRObjViewAppDelegate.mm in Sources */, - 28D7ACF80DDB3853001CB0EB /* KRObjViewViewController.mm in Sources */, - 1063FC77136D6A1B00EE555B /* KRObjViewGLView.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 1D6058940D05DD3E006BFB54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = KRObjView_Prefix.pch; - HEADER_SEARCH_PATHS = ""; - "HEADER_SEARCH_PATHS[arch=*]" = ""; - INFOPLIST_FILE = "KRObjView-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/testflight\"", - ); - PRODUCT_NAME = KRObjView3; - PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; - TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; - }; - name = Debug; - }; - 1D6058950D05DD3E006BFB54 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; - COPY_PHASE_STRIP = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = KRObjView_Prefix.pch; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "KRObjView-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/testflight\"", - ); - PRODUCT_NAME = KRObjView3; - PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; - TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; - }; - name = Release; - }; - E4C5FCF01471B78500821FB1 /* Ad Hoc */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; - }; - name = "Ad Hoc"; - }; - E4C5FCF11471B78500821FB1 /* Ad Hoc */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; - COPY_PHASE_STRIP = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = KRObjView_Prefix.pch; - HEADER_SEARCH_PATHS = ""; - "HEADER_SEARCH_PATHS[arch=*]" = ""; - INFOPLIST_FILE = "KRObjView-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/testflight\"", - ); - PRODUCT_NAME = KRObjView3; - PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; - TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; - VALIDATE_PRODUCT = YES; - }; - name = "Ad Hoc"; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "KRObjView" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D6058940D05DD3E006BFB54 /* Debug */, - 1D6058950D05DD3E006BFB54 /* Release */, - E4C5FCF11471B78500821FB1 /* Ad Hoc */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "KRObjView" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - E4C5FCF01471B78500821FB1 /* Ad Hoc */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/objview/KRObjView.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/objview/KRObjView.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 3dd1fb7..0000000 --- a/objview/KRObjView.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/objview/KRObjView_Prefix.pch b/objview/KRObjView_Prefix.pch deleted file mode 100644 index 7a8d07a..0000000 --- a/objview/KRObjView_Prefix.pch +++ /dev/null @@ -1,9 +0,0 @@ -// -// Prefix header for all source files of the 'KRObjView' target in the 'KRObjView' project -// - -#ifdef __OBJC__ - #import - #import - #import "TestFlight.h" -#endif diff --git a/objview/MainWindow.xib b/objview/MainWindow.xib deleted file mode 100644 index dfed42c..0000000 --- a/objview/MainWindow.xib +++ /dev/null @@ -1,262 +0,0 @@ - - - - 1024 - 10K540 - 1305 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 300 - - - YES - IBUICustomObject - IBUIWindow - IBUIViewController - IBProxyObject - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - IBCocoaTouchFramework - - - KRObjViewViewController - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - 292 - {320, 480} - - 1 - MSAxIDEAA - - NO - NO - - IBCocoaTouchFramework - YES - - - - - YES - - - delegate - - - - 4 - - - - viewController - - - - 11 - - - - window - - - - 14 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - 3 - - - KRObjView App Delegate - - - -2 - - - - - 10 - - - - - 12 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 10.CustomClassName - 10.IBEditorWindowLastContentRect - 10.IBPluginDependency - 12.IBEditorWindowLastContentRect - 12.IBPluginDependency - 3.CustomClassName - 3.IBPluginDependency - - - YES - UIApplication - UIResponder - KRObjViewViewController - {{234, 376}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{525, 346}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - KRObjViewAppDelegate - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - - - - YES - - - - - 15 - - - - YES - - KRObjViewAppDelegate - NSObject - - YES - - YES - viewController - window - - - YES - KRObjViewViewController - UIWindow - - - - YES - - YES - viewController - window - - - YES - - viewController - KRObjViewViewController - - - window - UIWindow - - - - - IBProjectSource - ./Classes/KRObjViewAppDelegate.h - - - - KRObjViewViewController - UIViewController - - overlayLayer - CALayer - - - overlayLayer - - overlayLayer - CALayer - - - - IBProjectSource - ./Classes/KRObjViewViewController.h - - - - CALayer - NSObject - - IBProjectSource - ./Classes/CALayer.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - 3 - 300 - - diff --git a/objview/iPad/MainWindow-iPad.xib b/objview/iPad/MainWindow-iPad.xib deleted file mode 100644 index 7a66a79..0000000 --- a/objview/iPad/MainWindow-iPad.xib +++ /dev/null @@ -1,274 +0,0 @@ - - - - 1056 - 10J869 - 1305 - 1038.35 - 461.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 300 - - - YES - IBUICustomObject - IBUIWindow - IBUIViewController - IBProxyObject - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - IBIPadFramework - - - KRObjViewViewController - - 2 - - - 1 - 1 - - IBIPadFramework - NO - - - - 292 - {768, 1024} - - 1 - MSAxIDEAA - - NO - NO - - IBIPadFramework - YES - - - - - YES - - - delegate - - - - 4 - - - - viewController - - - - 11 - - - - window - - - - 14 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - 3 - - - KRObjView App Delegate - - - -2 - - - - - 10 - - - - - 12 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 10.CustomClassName - 10.IBEditorWindowLastContentRect - 10.IBLastUsedUIStatusBarStylesToTargetRuntimesMap - 10.IBPluginDependency - 12.IBEditorWindowLastContentRect - 12.IBLastUsedUIStatusBarStylesToTargetRuntimesMap - 12.IBPluginDependency - 3.CustomClassName - 3.IBPluginDependency - - - YES - UIApplication - UIResponder - KRObjViewViewController - {{234, 376}, {320, 480}} - - IBCocoaTouchFramework - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{525, 346}, {320, 480}} - - IBCocoaTouchFramework - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - KRObjViewAppDelegate - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - - - - YES - - - - - 15 - - - - YES - - KRObjViewAppDelegate - NSObject - - YES - - YES - viewController - window - - - YES - KRObjViewViewController - UIWindow - - - - YES - - YES - viewController - window - - - YES - - viewController - KRObjViewViewController - - - window - UIWindow - - - - - IBProjectSource - ./Classes/KRObjViewAppDelegate.h - - - - KRObjViewViewController - UIViewController - - overlayLayer - CALayer - - - overlayLayer - - overlayLayer - CALayer - - - - IBProjectSource - ./Classes/KRObjViewViewController.h - - - - CALayer - NSObject - - IBProjectSource - ./Classes/CALayer.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - 3 - 300 - - diff --git a/objview/iPad/Storyboard-ipad.storyboard b/objview/iPad/Storyboard-ipad.storyboard deleted file mode 100644 index cfeecf4..0000000 --- a/objview/iPad/Storyboard-ipad.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/objview/main.m b/objview/main.m deleted file mode 100644 index 2f05be1..0000000 --- a/objview/main.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// main.m -// KRObjView -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, nil); - [pool release]; - return retVal; -} diff --git a/objview/testflight/README.md b/objview/testflight/README.md deleted file mode 100644 index 8ee3124..0000000 --- a/objview/testflight/README.md +++ /dev/null @@ -1,225 +0,0 @@ -##Introduction - -The TestFlight SDK allows you to track how beta testers are testing your application. Out of the box we track simple usage information, such as which tester is using your application, their device model/OS, how long they used the application, logs of their test session, and automatic recording of any crashes they encounter. - -To get the most out of the SDK we have provided the Checkpoint API. - -The Checkpoint API is used to help you track exactly how your testers are using your application. Curious about which users passed level 5 in your game, or posted their high score to Twitter, or found that obscure feature? With a single line of code you can finally gather all this information. Wondering how many times your app has crashed? Wondering who your power testers are? We've got you covered. See more information on the Checkpoint API in section 4. - -Alongside the Checkpoint API is the Questions interface. The Questions interface is managed on a per build basis on the TestFlight website. Find out more about the Questions Interface in section 6. - -For more detailed debugging we have a remote logging solution. Find out more about our logging system with TFLog in the Remote Logging section. - - -##Considerations - -Information gathered by the SDK is sent to the website in real time. When an application is put into the background (iOS 4.x) or terminated (iOS 3.x) we try to send the finalizing information for the session during the time allowed for finalizing the application. Should all of the data not get sent the remaining data will be sent the next time the application is launched. As such, to get the most out of the SDK we recommend your application support iOS 4.0 and higher. - -This SDK can be run from both the iPhone Simulator and Device and has been tested using Xcode 4.0. - - -##Integration - -1. Add the files to your project: File -> Add Files to " " - 1. Find and select the folder that contains the SDK - 2. Make sure that "Copy items into destination folder (if needed)" is checked - 3. Set Folders to "Create groups for any added folders" - 4. Select all targets that you want to add the SDK to -2. Verify that libTestFlight.a has been added to the Link Binary With Libraries Build Phase for the targets you want to use the SDK with - 1. Select your Project in the Project Navigator - 2. Select the target you want to enable the SDK for - 3. Select the Build Phases tab - 4. Open the Link Binary With Libraries Phase - 5. If libTestFlight.a is not listed, drag and drop the library from your Project Navigator to the Link Binary With Libraries area - 6. Repeat Steps 2 - 5 until all targets you want to use the SDK with have the SDK linked -3. Add libz to your Link Binary With Libraries Build Phase - 1. Select your Project in the Project Navigator - 2. Select the target you want to enable the SDK for - 3. Select the Build Phases tab - 4. Open the Link Binary With Libraries Phase - 5. Click the + to add a new library - 6. Find libz.dylib in the list and add it - 7. Repeat Steps 2 - 6 until all targets you want to use the SDK with have libz.dylib - -4. In your Application Delegate: - 1. Import TestFlight: `#import "TestFlight.h"` - - ***NOTE:*** Rather than importing `TestFlight.h` in every file you may add the above line into you pre-compiled header (`_Prefix.pch`) file inside of the - - - #ifdef __OBJC__ - - - section. This will give you access to the SDK across all files. - - 2. Get your Team Token which you can find at [http://testflightapp.com/dashboard/team/](http://testflightapp.com/dashboard/team/) select the team you are using from the team selection drop down list on the top of the page and then select Team Info. - - 3. Launch TestFlight with your Team Token - - -(BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // start of your application:didFinishLaunchingWithOptions - // ... - [TestFlight takeOff:@"Insert your Team Token here"]; - // The rest of your application:didFinishLaunchingWithOptions method - // ... - } - - 4. To report crashes to you we install our own uncaught exception handler. If you are not currently using an exception handler of your own then all you need to do is go to the next step. If you currently use an Exception Handler, or you use another framework that does please go to the section on advanced exception handling. - -5. To enable the best crash reporting possible we recommend setting the following project build settings in Xcode to NO for all targets that you want to have live crash reporting for. You can find build settings by opening the Project Navigator (default command+1 or command+shift+j) then clicking on the project you are configuring (usually the first selection in the list). From there you can choose to either change the global project settings or settings on an individual project basis. All settings below are in the Deployment Section. - - 1. Deployment Post Processing - 2. Strip Debug Symbols During Copy - 3. Strip Linked Product - -##Beta Testing and Release Differentiation - -In order to provide more information about your testers while beta testing you will need to provide the device's unique identifier. This identifier is not something that the SDK will collect from the device and we do not recommend using this in production. To send the device identifier to us put the following code before your call to takeOff. - - #define TESTING 1 - #ifdef TESTING - [TestFlight setDeviceIdentifier:[[UIDevice currentDevice] uniqueIdentifier]]; - #endif - -This will allow you to have the best possible information during testing, but disable getting and sending of the device unique identifier when you release your application. When it is time to release simply comment out #define TESTING 1. If you decide to not include the device's unique identifier during your testing phase TestFlight will still collect all of the information that you send but it may be anonymized. - - -##Checkpoint API - -When a tester does something you care about in your app you can pass a checkpoint. For example completing a level, adding a todo item, etc. The checkpoint progress is used to provide insight into how your testers are testing your apps. The passed checkpoints are also attached to crashes, which can help when creating steps to replicate. - -`[TestFlight passCheckpoint:@"CHECKPOINT_NAME"];` Use `passCheckpoint:` to track when a user performs certain tasks in your application. This can be useful for making sure testers are hitting all parts of your application, as well as tracking which testers are being thorough. - -##Feedback API - -To launch unguided feedback call the openFeedbackView method. We recommend that you call this from a GUI element. - - -(IBAction)launchFeedback { - [TestFlight openFeedbackView]; - } - -If you want to create your own feedback form you can use the submitCustomFeedback method to submit the feedback that the user has entered. - - -(IBAction)submitFeedbackPressed:(id)sender { - NSString *feedback = [self getUserFeedback]; - [TestFlight submitFeedback:feedback]; - } - -The above sample assumes that [self getUserFeedback] is implemented such that it obtains the users feedback from the GUI element you have created and that submitFeedbackPressed is the action for your submit button. - -Once users have submitted feedback from inside of the application you can view it in the feedback area of your build page. - - -##Upload your build - -After you have integrated the SDK into your application you need to upload your build to TestFlight. You can upload from your dashboard or or using the Upload API, full documentation at [https://testflightapp.com/api/doc/](https://testflightapp.com/api/doc/) - -##Questions Interface - -In order to ask a question, you'll need to associate it with a checkpoint. Make sure your checkpoints are initialized by running your app and hitting them all yourself before you start adding questions. - -There are three question types available: Yes/No, Multiple Choice, and Long Answer. - -To create questions, visit your builds Questions page and click on 'Add Question'. If you choose Multiple Choice, you'll need to enter a list of possible answers for your testers to choose from — otherwise, you'll only need to enter your question's, well, question. If your build has no questions, you can also choose to migrate questions from another build (because seriously — who wants to do all that typing again)? - -After restarting your application on an approved device, when you pass the checkpoint associated with your questions a TestFlight modal question form will appear on the screen asking the beta tester to answer your question. - -After you upload a new build to TestFlight you will need to associate questions once again. However if your checkpoints and questions have remained the same you can choose "copy questions from an older build" and choose which build to copy the questions from. - -##View the results - -As testers install your build and start to test it you will see their session data on the web on the build report page for the build you've uploaded. - -##Advanced Exception Handling - -An uncaught exception means that your application is in an unknown state and there is not much that you can do but try and exit gracefully. Our SDK does its best to get the data we collect in this situation to you while it is crashing, but it is designed in such a way that the important act of saving the data occurs in as safe way a way as possible before trying to send anything. If you do use uncaught exception or signal handlers install your handlers before calling `takeOff`. Our SDK will then call your handler while ours is running. For example: - - /* - My Apps Custom uncaught exception catcher, we do special stuff here, and TestFlight takes care of the rest - */ - void HandleExceptions(NSException *exception) { - NSLog(@"This is where we save the application data during a exception"); - // Save application data on crash - } - /* - My Apps Custom signal catcher, we do special stuff here, and TestFlight takes care of the rest - */ - void SignalHandler(int sig) { - NSLog(@"This is where we save the application data during a signal"); - // Save application data on crash - } - - -(BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // installs HandleExceptions as the Uncaught Exception Handler - NSSetUncaughtExceptionHandler(&HandleExceptions); - // create the signal action structure - struct sigaction newSignalAction; - // initialize the signal action structure - memset(&newSignalAction, 0, sizeof(newSignalAction)); - // set SignalHandler as the handler in the signal action structure - newSignalAction.sa_handler = &SignalHandler; - // set SignalHandler as the handlers for SIGABRT, SIGILL and SIGBUS - sigaction(SIGABRT, &newSignalAction, NULL); - sigaction(SIGILL, &newSignalAction, NULL); - sigaction(SIGBUS, &newSignalAction, NULL); - // Call takeOff after install your own unhandled exception and signal handlers - [TestFlight takeOff:@"Insert your Team Token here"]; - // continue with your application initialization - } - -You do not need to add the above code if your application does not use exception handling already. - -##Remote Logging - -To perform remote logging you can use the TFLog method which logs in a few different methods described below. In order to make the transition from NSLog to TFLog easy we have used the same method signature for TFLog as NSLog. You can easily switch over to TFLog by adding the following macro to your header - - #define NSLog TFLog - -That will do a switch from NSLog to TFLog, if you want more information, such as file name and line number you can use a macro like - - #define NSLog(__FORMAT__, ...) TFLog((@"%s [Line %d] " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__) - -Which will produce output that looks like - - -[HTFCheckpointsController showYesNoQuestion:] [Line 45] Pressed YES/NO - -We have implemented three different loggers. - - 1. TestFlight logger - 2. Apple System Log logger - 3. STDERR logger - -Each of the loggers log asynchronously and all TFLog calls are non blocking. The TestFlight logger writes its data to a file which is then sent to our servers on Session End events. The Apple System Logger sends its messages to the Apple System Log and are viewable using the Organizer in Xcode when the device is attached to your computer. The ASL logger can be disabled by turning it off in your TestFlight options - - [TestFlight setOptions:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:@"logToConsole"]]; - -The default option is YES. - -The STDERR logger sends log messages to STDERR so that you can see your log statements while debugging. The STDERR logger is only active when a debugger is attached to your application. If you do not wish to use the STDERR logger you can disable it by turning it off in your TestFlight options - - [TestFlight setOptions:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:@"logToSTDERR"]]; - -The default option is YES. - -## Advanced Remote Logging - -For most users we expect using TFLog to provide all of the logging functionality that they need. For the occasion where you need to provide a wrapper around TFLog we provide - - void TFLogv(NSString *format, va_list arg_list); - -Using TFLogv you can have your method that accepts a variable number of arguments that then passes that format and argument list to TFLog. - - -##iOS3 - -We now require that anyone who is writing an application that supports iOS3 add the System.framework as an optional link. In order to provide a better shutdown experience we send any large log files to our servers in the background. To add System.framework as an optional link: - -1. Select your Project in the Project Navigator -2. Select the target you want to enable the SDK for -3. Select the Build Phases tab -4. Open the Link Binary With Libraries Phase -5. Click the + to add a new library -6. Find libSystem.dylib in the list and add it -7. To the right of libSystem.dylib in the Link Binary With Libraries pane change "Required" to "Optional" diff --git a/objview/testflight/TestFlight.h b/objview/testflight/TestFlight.h deleted file mode 100644 index 6b23af5..0000000 --- a/objview/testflight/TestFlight.h +++ /dev/null @@ -1,101 +0,0 @@ -// -// TestFlight.h -// libTestFlight -// -// Created by Jonathan Janzen on 06/11/11. -// Copyright 2011 TestFlight. All rights reserved. - -#import -#define TESTFLIGHT_SDK_VERSION @"1.1" -#undef TFLog - -#if __cplusplus -extern "C" { -#endif - void TFLog(NSString *format, ...); - void TFLogv(NSString *format, va_list arg_list); -#if __cplusplus -} -#endif - -/** - * TestFlight object - * All methods are class level - */ -@interface TestFlight : NSObject { - -} - -/** - * Add custom environment information - * If you want to track custom information such as a user name from your application you can add it here - * - * @param information A string containing the environment you are storing - * @param key The key to store the information with - */ -+ (void)addCustomEnvironmentInformation:(NSString *)information forKey:(NSString*)key; - -/** - * Starts a TestFlight session - * - * @param teamToken Will be your team token obtained from https://testflightapp.com/dashboard/team/edit/ - */ -+ (void)takeOff:(NSString *)teamToken; - -/** - * Sets custom options - * - * @param options NSDictionary containing the options you want to set available options are described below - * - * Option Accepted Values Description - * reinstallCrashHandlers [ NSNumber numberWithBool:YES ] Reinstalls crash handlers, to be used if a third party - * library installs crash handlers overtop of the TestFlight Crash Handlers - * logToConsole [ NSNumber numberWithBool:YES ] YES - default, sends log statements to Apple System Log and TestFlight log - * NO - sends log statements to TestFlight log only - * logToSTDERR [ NSNumber numberWithBool:YES ] YES - default, sends log statements to STDERR when debugger is attached - * NO - sends log statements to TestFlight log only - * sendLogOnlyOnCrash [ NSNumber numberWithBool:YES ] NO - default, sends logs to TestFlight at the end of every session - * YES - sends logs statements to TestFlight only if there was a crash - * attachBacktraceToFeedback [ NSNumber numberWithBool:YES ] NO - default, feedback is sent exactly as the user enters it - * YES - attaches the current backtrace, with symbols, to the feedback. - * disableInAppUpdates [ NSNumber numberWithBool:YES ] NO - default, in application updates are allowed - * YES - the in application update screen will not be displayed - */ -+ (void)setOptions:(NSDictionary*)options; - -/** - * Track when a user has passed a checkpoint after the flight has taken off. Eg. passed level 1, posted high score - * - * @param checkpointName The name of the checkpoint, this should be a static string - */ -+ (void)passCheckpoint:(NSString *)checkpointName; - -/** - * Opens a feedback window that is not attached to a checkpoint - */ -+ (void)openFeedbackView; - -/** - * Submits custom feedback to the site. Sends the data in feedback to the site. This is to be used as the method to submit - * feedback from custom feedback forms. - * - * @param feedback Your users feedback, method does nothing if feedback is nil - */ -+ (void)submitFeedback:(NSString*)feedback; - -/** - * Sets the Device Identifier. - * The SDK no longer obtains the device unique identifier. This method should only be used during testing so that you can - * identify a testers test data with them. If you do not provide the identifier you will still see all session data, with checkpoints - * and logs, but the data will be anonymized. - * It is recommended that you only use this method during testing. We also recommended that you wrap this method with a pre-processor - * directive that is only active for non-app store builds. - * #ifndef RELEASE - * [TestFlight setDeviceIdentifier:[[UIDevice currentDevice] uniqueIdentifier]]; - * #endif - * - * @param deviceIdentifer The current devices device identifier - */ -+ (void)setDeviceIdentifier:(NSString*)deviceIdentifer; - -@end diff --git a/objview/testflight/release_notes.md b/objview/testflight/release_notes.md deleted file mode 100644 index 56914d9..0000000 --- a/objview/testflight/release_notes.md +++ /dev/null @@ -1,199 +0,0 @@ -##1.1 - September 13, 2012 - -* armv7s and iOS 6 support -* Updated for general release - -##1.1 BETA 3 - September 12, 2012 - -* armv7s slice added to library -* fixed typo for in application updates, inAppUdates changed to inAppUpdates - -##1.1 BETA 2 - September 6, 2012 - -* Re-enabled armv6 support -* Added option to disable in application updates - -##1.1 BETA 1 - July 13, 2012 - -* Added TFLogv to allow for log customizations. Check the README or online docs for more information. -* Added option attachBacktraceToFeedback, which attaches a backtrace to feedback sent from the SDK. For users who use feedback in more than one location in the application. -* Resolved issue where other exception handlers would not be called during an exception. -* SDK now sends the device language for a session. -* Documentation fixes. -* Stability fixes. - -###1.0 - March 29, 2012 - -* Resolved occurrences of exceptions with the message "No background task exists with identifier 0" - -###1.0 BETA 1 - March 23, 2012 - -* Privacy Updates -* UDID is no longer collected by the SDK. During testing please use `[TestFlight setDeviceIdentifier:[[UIDevice currentDevice] uniqueIdentifier]];` to send the UDID so you can identify your testers. For release do not set `+setDeviceIdentifier`. See Beta Testing and Release Differentiation in the README or online at [https://testflightapp.com/sdk/doc/1.0beta1/](http://testflightapp.com/sdk/doc/1.0beta1/) - -###0.8.3 - February 14, 2012 - -* Rolled previous beta code into release builds -* No longer allow in application updates to occur in applications that were obtained from the app store. - -**Tested compiled library with:** - -* Xcode 4.3 -* Xcode 4.2 -* Xcode 4.1 -* Xcode 3.2.6 - -###0.8.3 BETA 5 - February 10, 2012 - -* Changed logging from asynchronous to synchronous. -* Resolved crash when looking for a log path failed. -* Added submitFeedback to the TestFlight class to allow for custom feedback forms. - -###0.8.3 BETA 4 - January 20, 2012 - -* Resolved an issue that occured when an application was upgraded from 0.8.3 BETA 1 to 0.8.3 BETA 3+ with unsent data from 0.8.3 BETA 1 - -###0.8.3 BETA 3 - January 19, 2012 - -* On crash log files over 64k will not be sent until next launch. - -**Known Issues:** - -* Logging massive amounts of data at the end of a session may prevent the application from launching in time on next launch - -###0.8.3 BETA 2 - January 13, 2012 - -* libz.dylib is now required to be added to your "Link Binary with Libraries" build phase -* Log file compression, The compression is done on an as needed basis rather than before sending -* Changed all outgoing data from JSON to MessagePack -* Added option `logToSTDERR` to disable the `STDERR` logger - -###0.8.3 BETA 1 - December 29, 2011 - -* In rare occurrences old session data that had not been sent to our server may have been discarded or attached to the wrong build. It is now no longer discarded -* Made sending of Session End events more robust -* Network queuing system does better bursting of unsent data -* Log files that are larger than 64K are now sent sometime after the next launch -* Log files that are larger than 16MB are no longer supported and will be replaced with a message indicating the log file was too large -* Fixed crashes while resuming from background - -###0.8.2 - December 20, 2011 - -* Promoted 0.8.2 BETA 4 to stable - -**Known Issues:** - -* Under some circumstances Session End events may not be sent until the next launch. -* With large log files Session End events may take a long time to show up. - -**Tested compiled library with:** - -* Xcode 4.3 -* Xcode 4.2 -* Xcode 4.1 -* Xcode 3.2.6 - -###0.8.2 BETA 4 - December 12, 2011 - -* Prevented "The string argument is NULL" from occuring during finishedHandshake in rare cases -* Resolved issue where data recorded while offline may not be sent - -###0.8.2 BETA 3 - December 8, 2011 - -* Added auto-release pools to background setup and tear down - -###0.8.2 BETA 2 - December 5, 2011 - -* Fixed the "pointer being freed was not allocated" bug - -###0.8.1 - November 18, 2011 - -* Implemented TFLog logging system, see README for more information -* Fixed an issue where Session End events may not be sent until next launch -* Fixed an issue where duplicate events could be sent -* Fixed an issue with Session End events not being sent from some iPod touch models - -**Tested compiled library with:** - -* Xcode 4.2 -* Xcode 4.1 -* Xcode 3.2.6 - -###0.8 - November 8, 2011 - -* Added `SIGTRAP` as a signal type that we catch -* Removed all Objective-c from crash reporting -* Removed the use of non signal safe functions from signal handling -* Created a signal safe way to get symbols from a stack trace -* Changed the keyboardType for Long Answer Questions and Feedback to allow for international character input -* Changed `TESTFLIGHT_SDK_VERSION` string to be an `NSString` -* Changed cache folder from Library/Caches/TestFlight to Library/Caches/com.testflight.testflightsdk -* Fixed issue with saving data when device is offline -* Fixed compability issues with iOS 3 -* Added calling into the rootViewController shouldAutorotateToInterfaceOrientation if a rootViewController is set -* Made the comments in TestFlight.h compatible with Appledoc - -Tested compiled library with: - -* Xcode 4.2 -* Xcode 4.1 -* Xcode 3.2 - -###0.7.2 - September 29, 2011 - -* Changed `TESTFLIGHT_SDK_VERSION` string to be an `NSString` -* Fixed an issue where exiting an application while the SDK is active caused modal views to be dismissed - -###0.7.1 - September 22, 2011 - -* Internal release -* Refactoring - -###0.7 - September 21, 2011 - -* Moved TestFlight images and data to the Library/Caches folder -* Resolved an issue where sometimes the rootViewController could not be found and feedback, questions and upgrade views would not be displayed -* In application upgrade changed to allow skipping until the next version is installed and allows upgrades to be forced -* Fixed a memory leak when launching questions - -###0.6 - September 2, 2011 - -* Renamed base64_encode to testflight_base64_encode to remove a conflict with other third party libraries -* Added ability to reinstall crash handlers when they are overwritten using the setOptions API -* Fixed an issue where crash reports might not get sent under certain circumstances -* Fixed a deadlock when the application is put in the background and then resumed before all information can be sent -* Fixed an issue when attempting to un-install all signal handlers during a signal -* Added support for landscape mode on the iPad to the Questions and Feedback views -* Crash reporting now works in versions of Xcode earlier than 4.2 -* Fixed a memory leak during handshake - -###0.5 - August 19, 2011 - -* Feedback that is not attached to a checkpoint [TestFlight openFeedbackView] -* Usability changes to question views -* Removed pause and resume sessions, replaced with sessions being stopped and started -* Added text auto correction to the Long Answer question type -* Crash reports now send on crash instead of next launch - -###0.4 - August 15, 2011 - -* In Application Feedback with Questions -* In application updates -* Custom Environment Information added -* Networking stack reimplementation -* Exception handling fixes - -###0.3 - June 15, 2011 - -* Removed all mention of JSONKit from the README -* Added support for using both the Bundle Version and the Bundle Short Version string - -###0.2 - June 14, 2011 - -* Removed all categories this allows users to use the SDK without having to set -ObjC and -load_all -* Prefixed JSONKit for use in TestFlight to remove reported issues where some users were already using JSONKit -* Added support for armv6 again - -###0.1 - June 11, 2011 - -* Initial Version