diff --git a/Kraken.xcodeproj/project.pbxproj b/Kraken.xcodeproj/project.pbxproj index 44996a4..a6f6608 100755 --- a/Kraken.xcodeproj/project.pbxproj +++ b/Kraken.xcodeproj/project.pbxproj @@ -103,8 +103,8 @@ E4159B8B19C5760900622D1E /* KRStockGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = E4030E4B160A3CF000592648 /* KRStockGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; }; E4159B8C19C5760900622D1E /* KRStreamer.h in Headers */ = {isa = PBXBuildFile; fileRef = E43F70E41824D9AB00136169 /* KRStreamer.h */; settings = {ATTRIBUTES = (Public, ); }; }; E4159B8D19C5760900622D1E /* KRViewport.h in Headers */ = {isa = PBXBuildFile; fileRef = E4CA11731639CBD1005D9400 /* KRViewport.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E4159B8E19C5762F00622D1E /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03C418790EC0006DA23F /* tinyxml2.cpp */; }; - E4159B8F19C5762F00622D1E /* forsyth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03CB18790EFF006DA23F /* forsyth.cpp */; }; + E4159B8E19C5762F00622D1E /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03C418790EC0006DA23F /* tinyxml2.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; + E4159B8F19C5762F00622D1E /* forsyth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03CB18790EFF006DA23F /* forsyth.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; E4159B9019C5762F00622D1E /* KRAudioManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F027C516979CCD00D4427D /* KRAudioManager.cpp */; }; E4159B9119C5762F00622D1E /* KRAudioSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F027CC16979CE200D4427D /* KRAudioSample.cpp */; }; E4159B9219C5762F00622D1E /* KRAudioBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F027DC1697BFFF00D4427D /* KRAudioBuffer.cpp */; }; @@ -387,9 +387,9 @@ E45E03BC18790DD1006DA23F /* PVRTString.h in Headers */ = {isa = PBXBuildFile; fileRef = E45E03AF18790DD1006DA23F /* PVRTString.h */; settings = {ATTRIBUTES = (Public, ); }; }; E45E03BD18790DD1006DA23F /* PVRTTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = E45E03B018790DD1006DA23F /* PVRTTexture.h */; settings = {ATTRIBUTES = (Public, ); }; }; E45E03C018790DF5006DA23F /* libPVRTexLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E45E03BF18790DF5006DA23F /* libPVRTexLib.a */; }; - E45E03C818790EC0006DA23F /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03C418790EC0006DA23F /* tinyxml2.cpp */; }; + E45E03C818790EC0006DA23F /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03C418790EC0006DA23F /* tinyxml2.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; E45E03CA18790EC0006DA23F /* tinyxml2.h in Headers */ = {isa = PBXBuildFile; fileRef = E45E03C518790EC0006DA23F /* tinyxml2.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E45E03CE18790EFF006DA23F /* forsyth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03CB18790EFF006DA23F /* forsyth.cpp */; }; + E45E03CE18790EFF006DA23F /* forsyth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45E03CB18790EFF006DA23F /* forsyth.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; E45E03D018790EFF006DA23F /* forsyth.h in Headers */ = {isa = PBXBuildFile; fileRef = E45E03CC18790EFF006DA23F /* forsyth.h */; settings = {ATTRIBUTES = (Public, ); }; }; E460292B16682BF700261BB9 /* libfbxsdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E460292916682BD900261BB9 /* libfbxsdk.a */; }; E460292C166834AB00261BB9 /* KRTextureAnimated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E460292716681D1000261BB9 /* KRTextureAnimated.cpp */; }; @@ -1988,7 +1988,7 @@ E491015813C99B9D0098455B /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0600; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Kearwood Software"; TargetAttributes = { E48C527919C570C50062E439 = { @@ -2344,6 +2344,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E45E03C818790EC0006DA23F /* tinyxml2.cpp in Sources */, + E45E03CE18790EFF006DA23F /* forsyth.cpp in Sources */, E499BF2516AE8C20007FCDBE /* KREngine.mm in Sources */, 10CC33A5168534F000BB9846 /* KRCamera.cpp in Sources */, E460292C166834AB00261BB9 /* KRTextureAnimated.cpp in Sources */, @@ -2359,7 +2361,6 @@ E497B954151BEDA600D3DC67 /* KRResource+fbx.cpp in Sources */, E4F97551153633E200FD60B2 /* KRMaterialManager.cpp in Sources */, E461A15A152E557E00F2044A /* KRPointLight.cpp in Sources */, - E45E03C818790EC0006DA23F /* tinyxml2.cpp in Sources */, E4F9754F1536333200FD60B2 /* KRMesh.cpp in Sources */, E4F9754B153632D800FD60B2 /* KRMeshManager.cpp in Sources */, E461A160152E565700F2044A /* KRDirectionalLight.cpp in Sources */, @@ -2367,7 +2368,6 @@ E4F9754015362CD400FD60B2 /* KRScene.cpp in Sources */, E461A166152E56C000F2044A /* KRSpotLight.cpp in Sources */, E4F9754315362D0F00FD60B2 /* KRModel.cpp in Sources */, - E45E03CE18790EFF006DA23F /* forsyth.cpp in Sources */, E4F975371536221C00FD60B2 /* KRNode.cpp in Sources */, E4F9754E1536331D00FD60B2 /* KRTextureManager.cpp in Sources */, E4D13367153768610070068C /* KRShader.cpp in Sources */, @@ -2485,6 +2485,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -2505,11 +2506,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = kraken_tvos/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "\"$(SYSTEM_APPS_DIR)/Autodesk/FBX SDK/2014.2/lib/ios-armv7/debug\""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.kraken; PRODUCT_NAME = kraken; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.1; @@ -2532,6 +2534,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -2547,11 +2550,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = kraken_tvos/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "\"$(SYSTEM_APPS_DIR)/Autodesk/FBX SDK/2014.2/lib/ios-armv7/release\""; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.kraken; PRODUCT_NAME = kraken; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.1; @@ -2575,7 +2579,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -2595,11 +2599,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = kraken_ios/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "\"$(SYSTEM_APPS_DIR)/Autodesk/FBX SDK/2014.2/lib/ios-armv7/debug\""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.kraken; PRODUCT_NAME = kraken; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2623,7 +2628,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2638,11 +2643,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = kraken_ios/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "\"$(SYSTEM_APPS_DIR)/Autodesk/FBX SDK/2014.2/lib/ios-armv7/release\""; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.kraken; PRODUCT_NAME = kraken; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2658,19 +2664,41 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c11; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = YES; GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/local/include/; LLVM_VECTORIZE_LOOPS = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; SDKROOT = appletvos; SKIP_INSTALL = YES; }; @@ -2681,12 +2709,33 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = c11; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = fast; GCC_UNROLL_LOOPS = YES; GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/local/include/; LLVM_VECTORIZE_LOOPS = YES; @@ -2726,6 +2775,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.standardassets; PRODUCT_NAME = kraken_standard_assets_tvos; SDKROOT = macosx; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; @@ -2758,6 +2808,7 @@ INFOPLIST_FILE = "kraken_standard_assets_tvos/Resources-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; MACOSX_DEPLOYMENT_TARGET = 10.8; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.standardassets; PRODUCT_NAME = kraken_standard_assets_tvos; SDKROOT = macosx; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; @@ -2801,6 +2852,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.kraken; PRODUCT_NAME = kraken; SDKROOT = macosx; SHARED_PRECOMPS_DIR = "$(CACHE_ROOT)/SharedPrecompiledHeaders_osx"; @@ -2843,6 +2895,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.kraken; PRODUCT_NAME = kraken; SDKROOT = macosx; SHARED_PRECOMPS_DIR = "$(CACHE_ROOT)/SharedPrecompiledHeaders_osx"; @@ -2879,6 +2932,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.standardassets; PRODUCT_NAME = kraken_standard_assets_ios; SDKROOT = macosx; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -2911,6 +2965,7 @@ INFOPLIST_FILE = "kraken_standard_assets_ios/Resources-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; MACOSX_DEPLOYMENT_TARGET = 10.8; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.standardassets; PRODUCT_NAME = kraken_standard_assets_ios; SDKROOT = macosx; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -2948,6 +3003,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.standardassets; PRODUCT_NAME = kraken_standard_assets_osx; SDKROOT = macosx; WRAPPER_EXTENSION = bundle; @@ -2978,6 +3034,7 @@ INFOPLIST_FILE = "kraken_standard_assets_osx/Resources-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; MACOSX_DEPLOYMENT_TARGET = 10.8; + PRODUCT_BUNDLE_IDENTIFIER = com.krakenengine.standardassets; PRODUCT_NAME = kraken_standard_assets_osx; SDKROOT = macosx; WRAPPER_EXTENSION = bundle; diff --git a/kraken/KRAudioManager.cpp b/kraken/KRAudioManager.cpp index b264076..f4c26e8 100755 --- a/kraken/KRAudioManager.cpp +++ b/kraken/KRAudioManager.cpp @@ -872,12 +872,11 @@ KRVector2 KRAudioManager::getNearestHRTFSample(const KRVector2 &dir) KRVector2 min_direction; bool first = true; - float min_distance; + float min_distance = 360.0f; for(std::vector::iterator itr = m_hrtf_sample_locations.begin(); itr != m_hrtf_sample_locations.end(); itr++) { if(first) { first = false; min_direction = (*itr); - min_distance = 360.0f; } else if((*itr).x == elevation) { float distance = fabs(dir_deg.y - (*itr).y); if(min_distance > distance) { @@ -1014,7 +1013,7 @@ void KRAudioManager::getHRTFMix(const KRVector2 &dir, KRVector2 &dir1, KRVector2 void KRAudioManager::initAudio() { - if(!m_initialized == NULL) { + if(!m_initialized) { m_initialized = true; m_output_sample = KRENGINE_AUDIO_BLOCK_LENGTH; @@ -1493,7 +1492,7 @@ void KRAudioManager::startFrame(float deltaTime) - if(source->getEnableOcclusion() && false) { + if(source->getEnableOcclusion() && /* FINDME!! DISABLES CODE */ (false)) { KRHitInfo hitinfo; if(source->getScene().lineCast(m_listener_position, source_world_position, hitinfo, KRAKEN_COLLIDER_AUDIO)) { gain = 0.0f; diff --git a/kraken/KRCamera.cpp b/kraken/KRCamera.cpp index ebe184b..d97f97f 100755 --- a/kraken/KRCamera.cpp +++ b/kraken/KRCamera.cpp @@ -671,7 +671,7 @@ void KRCamera::renderPost() GLDEBUG(glDisable(GL_BLEND)); - +/* static const GLfloat squareVerticesShadow[3][8] = {{ -1.0f, -1.0f, -0.60f, -1.0f, @@ -688,6 +688,7 @@ void KRCamera::renderPost() 0.00f, -0.60f, 0.40f, -0.60f, }}; +*/ GLDEBUG(glViewport(0, 0, m_viewport.getSize().x, m_viewport.getSize().y)); @@ -793,7 +794,7 @@ void KRCamera::renderPost() float dScaleX = 2.0 / (1024 / 16); float dScaleY = 2.0 / (768 / 16); float dTexScale = 1.0 / 16.0; - int iRow = row_count - 1; iCol = 0, iTab = 0; + int iRow = row_count - 1; iCol = 0; iTab = 0; while(*pChar) { char c = *pChar++; if(c == '\n') { diff --git a/kraken/KRDirectionalLight.cpp b/kraken/KRDirectionalLight.cpp index b68185a..250ad55 100755 --- a/kraken/KRDirectionalLight.cpp +++ b/kraken/KRDirectionalLight.cpp @@ -44,11 +44,13 @@ int KRDirectionalLight::configureShadowBufferViewports(const KRViewport &viewpor const float KRENGINE_SHADOW_BOUNDS_EXTRA_SCALE = 1.25f; // Scale to apply to view frustrum bounds so that we don't need to refresh shadows on every frame int cShadows = 1; for(int iShadow=0; iShadow < cShadows; iShadow++) { +/* GLfloat shadowMinDepths[3][3] = {{0.0f, 0.0f, 0.0f},{0.0f, 0.0f, 0.0f},{0.0f, 0.05f, 0.3f}}; GLfloat shadowMaxDepths[3][3] = {{0.0f, 0.0f, 1.0f},{0.1f, 0.0f, 0.0f},{0.1f, 0.3f, 1.0f}}; float min_depth = 0.0f; float max_depth = 1.0f; +*/ KRAABB worldSpacefrustrumSliceBounds = KRAABB(KRVector3(-1.0f, -1.0f, -1.0f), KRVector3(1.0f, 1.0f, 1.0f), KRMat4::Invert(viewport.getViewProjectionMatrix())); worldSpacefrustrumSliceBounds.scale(KRENGINE_SHADOW_BOUNDS_EXTRA_SCALE); diff --git a/kraken/KREngine-common.h b/kraken/KREngine-common.h index 95d4e2b..446ae35 100755 --- a/kraken/KREngine-common.h +++ b/kraken/KREngine-common.h @@ -204,7 +204,7 @@ fprintf(stderr, "Error at line number %d, in file %s. alGetError() returned %i f OSStatus e = x; \ if( e != noErr) \ { \ -fprintf(stderr, "Error at line number %d, in file %s. Returned %d for call %s\n",__LINE__, __FILE__, e, #x ); \ +fprintf(stderr, "Error at line number %d, in file %s. Returned %d for call %s\n",__LINE__, __FILE__, (int)e, #x ); \ } \ } #else diff --git a/kraken/KRMaterial.cpp b/kraken/KRMaterial.cpp index b9b3a84..d576c2a 100755 --- a/kraken/KRMaterial.cpp +++ b/kraken/KRMaterial.cpp @@ -34,7 +34,7 @@ #include "KRMaterial.h" #include "KRTextureManager.h" -#include "KRcontext.h" +#include "KRContext.h" KRMaterial::KRMaterial(KRContext &context, const char *szName) : KRResource(context, szName) { m_name = szName; diff --git a/kraken/KRMesh.cpp b/kraken/KRMesh.cpp index d75f962..9c2ff4b 100755 --- a/kraken/KRMesh.cpp +++ b/kraken/KRMesh.cpp @@ -1456,7 +1456,7 @@ void KRMesh::convertToIndexed() } } - delete szKey; + delete[] szKey; KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Convert to indexed, before: %i after: %i (%.2f%% saving)", getHeader()->vertex_count, mi.vertices.size(), ((float)getHeader()->vertex_count - (float)mi.vertices.size()) / (float)getHeader()->vertex_count * 100.0f); diff --git a/kraken/KRTexture.cpp b/kraken/KRTexture.cpp index c6e1e6f..fbe3553 100755 --- a/kraken/KRTexture.cpp +++ b/kraken/KRTexture.cpp @@ -66,32 +66,31 @@ long KRTexture::getReferencedMemSize() { void KRTexture::resize(int max_dim) { while(m_handle_lock.test_and_set()); // Spin lock - { - if(m_iHandle == m_iNewHandle) { - if(max_dim == 0) { - m_iNewHandle = 0; - } else { - int target_dim = max_dim; - if(target_dim < m_min_lod_max_dim) target_dim = m_min_lod_max_dim; + + if(m_iHandle == m_iNewHandle) { + if(max_dim == 0) { + m_iNewHandle = 0; + } else { + int target_dim = max_dim; + if(target_dim < m_min_lod_max_dim) target_dim = m_min_lod_max_dim; - if(m_new_lod_max_dim != target_dim || (m_iHandle == 0 && m_iNewHandle == 0)) { - assert(m_newTextureMemUsed == 0); - m_newTextureMemUsed = getMemRequiredForSize(target_dim); - - getContext().getTextureManager()->memoryChanged(m_newTextureMemUsed); - getContext().getTextureManager()->addMemoryTransferredThisFrame(m_newTextureMemUsed); - - if(!createGLTexture(target_dim)) { - getContext().getTextureManager()->memoryChanged(-m_newTextureMemUsed); - m_newTextureMemUsed = 0; - assert(false); // Failed to create the texture - } + if(m_new_lod_max_dim != target_dim || (m_iHandle == 0 && m_iNewHandle == 0)) { + assert(m_newTextureMemUsed == 0); + m_newTextureMemUsed = getMemRequiredForSize(target_dim); + + getContext().getTextureManager()->memoryChanged(m_newTextureMemUsed); + getContext().getTextureManager()->addMemoryTransferredThisFrame(m_newTextureMemUsed); + + if(!createGLTexture(target_dim)) { + getContext().getTextureManager()->memoryChanged(-m_newTextureMemUsed); + m_newTextureMemUsed = 0; + assert(false); // Failed to create the texture } } } - - m_handle_lock.clear(); } + + m_handle_lock.clear(); } GLuint KRTexture::getHandle() { diff --git a/kraken/KRTextureManager.cpp b/kraken/KRTextureManager.cpp index 79ac0ba..1f25a5e 100755 --- a/kraken/KRTextureManager.cpp +++ b/kraken/KRTextureManager.cpp @@ -148,6 +148,7 @@ KRTexture *KRTextureManager::getTextureCube(const char *szName) { if(itr == m_textures.end()) { // Defer resolving the texture cube until its referenced textures are ready +/* const GLenum TARGETS[6] = { GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, @@ -156,6 +157,7 @@ KRTexture *KRTextureManager::getTextureCube(const char *szName) { GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z }; +*/ const char *SUFFIXES[6] = { "_positive_x", diff --git a/kraken/KRTextureTGA.cpp b/kraken/KRTextureTGA.cpp index 6f1c237..01d9f30 100755 --- a/kraken/KRTextureTGA.cpp +++ b/kraken/KRTextureTGA.cpp @@ -95,12 +95,14 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int ¤t_lo m_pData->lock(); TGA_HEADER *pHeader = (TGA_HEADER *)m_pData->getStart(); unsigned char *pData = (unsigned char *)pHeader + (long)pHeader->idlength + (long)pHeader->colourmaplength * (long)pHeader->colourmaptype + sizeof(TGA_HEADER); - + +/* #if TARGET_OS_IPHONE GLenum base_internal_format = GL_BGRA; #else GLenum base_internal_format = pHeader->bitsperpixel == 24 ? GL_BGR : GL_BGRA; #endif +*/ GLenum internal_format = GL_RGBA; @@ -115,8 +117,6 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int ¤t_lo return false; // Mapped colors not supported } - GLenum err; - switch(pHeader->imagetype) { case 2: // rgb switch(pHeader->bitsperpixel) { diff --git a/kraken/KRVector3.cpp b/kraken/KRVector3.cpp index 8dfce96..05e700a 100755 --- a/kraken/KRVector3.cpp +++ b/kraken/KRVector3.cpp @@ -431,7 +431,9 @@ void KRVector3::setXMLAttribute(const std::string &base_name, tinyxml2::XMLEleme void KRVector3::getXMLAttribute(const std::string &base_name, tinyxml2::XMLElement *e, const KRVector3 &default_value) { - float new_x,new_y,new_z; + float new_x = 0.0f; + float new_y = 0.0f; + float new_z = 0.0f; if(e->QueryFloatAttribute((base_name + "_x").c_str(), &new_x) == tinyxml2::XML_SUCCESS && e->QueryFloatAttribute((base_name + "_y").c_str(), &new_y) == tinyxml2::XML_SUCCESS && e->QueryFloatAttribute((base_name + "_z").c_str(), &new_z) == tinyxml2::XML_SUCCESS) { diff --git a/kraken_ios/Info.plist b/kraken_ios/Info.plist index 5b15498..d3de8ee 100755 --- a/kraken_ios/Info.plist +++ b/kraken_ios/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.krakenengine.kraken + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/kraken_osx/Kraken-Info.plist b/kraken_osx/Kraken-Info.plist index 30f579c..c693f10 100755 --- a/kraken_osx/Kraken-Info.plist +++ b/kraken_osx/Kraken-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - com.krakenengine.kraken + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/kraken_standard_assets_ios/Resources-Info.plist b/kraken_standard_assets_ios/Resources-Info.plist index 95fb092..c71a54e 100755 --- a/kraken_standard_assets_ios/Resources-Info.plist +++ b/kraken_standard_assets_ios/Resources-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - com.krakenengine.standardassets + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/kraken_standard_assets_osx/Resources-Info.plist b/kraken_standard_assets_osx/Resources-Info.plist index 95fb092..c71a54e 100755 --- a/kraken_standard_assets_osx/Resources-Info.plist +++ b/kraken_standard_assets_osx/Resources-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - com.krakenengine.standardassets + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/kraken_standard_assets_tvos/Resources-Info.plist b/kraken_standard_assets_tvos/Resources-Info.plist index 95fb092..c71a54e 100755 --- a/kraken_standard_assets_tvos/Resources-Info.plist +++ b/kraken_standard_assets_tvos/Resources-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - com.krakenengine.standardassets + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/kraken_tvos/info.plist b/kraken_tvos/info.plist index 5b15498..d3de8ee 100755 --- a/kraken_tvos/info.plist +++ b/kraken_tvos/info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.krakenengine.kraken + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName