diff --git a/Classes/Retronator/Xni/Framework/Matrix.h b/Classes/Retronator/Xni/Framework/Matrix.h index 1bc5516..1a4f4f1 100644 --- a/Classes/Retronator/Xni/Framework/Matrix.h +++ b/Classes/Retronator/Xni/Framework/Matrix.h @@ -25,6 +25,7 @@ + (Matrix*) createScaleUniform:(float)scale; + (Matrix*) createScale:(Vector3*)scales; ++ (Matrix*) createScaleX:(float)xScale y:(float)yScale z:(float)zScale; + (Matrix*) createRotationX:(float)radians; + (Matrix*) createRotationY:(float)radians; diff --git a/Classes/Retronator/Xni/Framework/Matrix.m b/Classes/Retronator/Xni/Framework/Matrix.m index 12250c2..93fe7d2 100644 --- a/Classes/Retronator/Xni/Framework/Matrix.m +++ b/Classes/Retronator/Xni/Framework/Matrix.m @@ -61,6 +61,14 @@ return matrix; } ++ (Matrix *)createScaleX:(float)xScale y:(float)yScale z:(float)zScale { + Matrix *matrix = [Matrix identity]; + matrix.data->m11 = xScale; + matrix.data->m22 = yScale; + matrix.data->m33 = zScale; + return matrix; +} + + (Matrix*) createRotationX:(float)radians { Matrix *matrix = [Matrix identity]; matrix.data->m22 = cosf(radians); diff --git a/XNI.xcodeproj/project.pbxproj b/XNI.xcodeproj/project.pbxproj index 183f9fa..2b67e25 100644 --- a/XNI.xcodeproj/project.pbxproj +++ b/XNI.xcodeproj/project.pbxproj @@ -2282,7 +2282,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0430; ORGANIZATIONNAME = Retronator; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "XNI" */; @@ -2671,6 +2671,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = XNI_Prefix.pch; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; PRODUCT_NAME = XNI; @@ -2687,6 +2688,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = XNI_Prefix.pch; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; PRODUCT_NAME = XNI; @@ -2705,6 +2707,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ""; + GCC_THUMB_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 3.2; @@ -2722,6 +2725,7 @@ armv6, ); GCC_C_LANGUAGE_STANDARD = c99; + GCC_THUMB_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 3.2; @@ -2742,6 +2746,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = XNI_Prefix.pch; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; PRODUCT_NAME = XNI; @@ -2758,6 +2763,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = XNI_Prefix.pch; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; PRODUCT_NAME = XNI;