Moving some metal/objc type definitions to shared header.

slembcke · slembcke · commit d7dcfa184ddf · 2014-09-19T13:43:28.000-05:00
diff --git a/cocos2d-ios.xcodeproj/project.pbxproj b/cocos2d-ios.xcodeproj/project.pbxproj
@@ -675,6 +675,7 @@
 		D39FA9C818C1BC6B00441627 /* CCShader_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D39FA9C718C1BC6B00441627 /* CCShader_Private.h */; };
 		D3A2E7D2181E12750033614C /* CCPhysicsShape.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A2E7D0181E12750033614C /* CCPhysicsShape.h */; };
 		D3A2E7D3181E12750033614C /* CCPhysicsShape.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A2E7D1181E12750033614C /* CCPhysicsShape.m */; };
+		D3E3752F19CC842A0076CDBB /* CCRendererSharedTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3E3752E19CC842A0076CDBB /* CCRendererSharedTypes.h */; };
 		E01E6D8C121F130E001A484F /* CCLabelBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = E01E6D8A121F130E001A484F /* CCLabelBMFont.h */; };
 		E01E6D8D121F130E001A484F /* CCLabelBMFont.m in Sources */ = {isa = PBXBuildFile; fileRef = E01E6D8B121F130E001A484F /* CCLabelBMFont.m */; };
 		E02BB6D6126CA93A006E46A2 /* CCAnimationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E02BB6D4126CA93A006E46A2 /* CCAnimationCache.h */; };
@@ -1119,6 +1120,7 @@
 		D3A2E7D0181E12750033614C /* CCPhysicsShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsShape.h; sourceTree = "<group>"; };
 		D3A2E7D1181E12750033614C /* CCPhysicsShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPhysicsShape.m; sourceTree = "<group>"; };
 		D3C12815199D40AC005D2119 /* CCShaders.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = CCShaders.metal; sourceTree = "<group>"; };
+		D3E3752E19CC842A0076CDBB /* CCRendererSharedTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRendererSharedTypes.h; sourceTree = "<group>"; };
 		E01E6D8A121F130E001A484F /* CCLabelBMFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCLabelBMFont.h; sourceTree = "<group>"; };
 		E01E6D8B121F130E001A484F /* CCLabelBMFont.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CCLabelBMFont.m; sourceTree = "<group>"; };
 		E02BB6D4126CA93A006E46A2 /* CCAnimationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAnimationCache.h; sourceTree = "<group>"; };
@@ -1894,6 +1896,7 @@
 			children = (
 				D3903B0E199528A0003AA81A /* CCRenderDispatch.h */,
 				D3903B0F199528A0003AA81A /* CCRenderDispatch.m */,
+				D3E3752E19CC842A0076CDBB /* CCRendererSharedTypes.h */,
 				D34CAD6519C3A7A5009BED7A /* CCRendererBasicTypes.h */,
 				D34CAD6A19C3AA10009BED7A /* CCRendererBasicTypes_Private.h */,
 				D34CAD6819C3A7B3009BED7A /* CCRendererBasicTypes.m */,
@@ -2113,6 +2116,7 @@
 				5B063DD019637291002B1CDE /* ALWeakDictionary.h in Headers */,
 				E02BB704126CADEA006E46A2 /* CCAnimation.h in Headers */,
 				B7D273191822F4AA0054849B /* CCBuilderReader.h in Headers */,
+				D3E3752F19CC842A0076CDBB /* CCRendererSharedTypes.h in Headers */,
 				B7E775D018527EF0004221AA /* CCAppDelegate.h in Headers */,
 				E0BC7D9F1342CE7B001B4DCC /* CCShader.h in Headers */,
 				D2DDB09319805E8400233D80 /* CCMathUtilsAndroid.h in Headers */,
diff --git a/cocos2d-tests-ios.xcodeproj/project.pbxproj b/cocos2d-tests-ios.xcodeproj/project.pbxproj
@@ -1197,6 +1197,7 @@
 				GCC_PREFIX_HEADER = "cocos2d-ui-tests/ios/Prefix.pch";
 				INFOPLIST_FILE = "cocos2d-ui-tests/ios/Resources/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
+				MTL_HEADER_SEARCH_PATHS = "/Users/slembcke/Development/cocos2d-iphone/cocos2d";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lz",
@@ -1228,6 +1229,7 @@
 				GCC_PREFIX_HEADER = "cocos2d-ui-tests/ios/Prefix.pch";
 				INFOPLIST_FILE = "cocos2d-ui-tests/ios/Resources/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
+				MTL_HEADER_SEARCH_PATHS = "/Users/slembcke/Development/cocos2d-iphone/cocos2d";
 				OTHER_LDFLAGS = (
 					"-lz",
 					"-lsqlite3",
diff --git a/cocos2d/CCRenderer.m b/cocos2d/CCRenderer.m
@@ -291,7 +291,7 @@ -(void)prepareWithProjection:(const GLKMatrix4 *)projection framebuffer:(CCFrame
 	globalShaderUniforms[CCShaderUniformViewSize] = [NSValue valueWithGLKVector2:globals.viewSize];
 	
 	CCTime t = director.scheduler.currentTime;
-	globals.time = GLKVector4Make(t, t/2.0f, t/8.0f, t/8.0f);
+	globals.time = GLKVector4Make(t, t/2.0f, t/4.0f, t/8.0f);
 	globals.sinTime = GLKVector4Make(sinf(t*2.0f), sinf(t), sinf(t/2.0f), sinf(t/4.0f));
 	globals.cosTime = GLKVector4Make(cosf(t*2.0f), cosf(t), cosf(t/2.0f), cosf(t/4.0f));
 	globalShaderUniforms[CCShaderUniformTime] = [NSValue valueWithGLKVector4:globals.time];
diff --git a/cocos2d/CCRendererBasicTypes.h b/cocos2d/CCRendererBasicTypes.h
@@ -23,18 +23,9 @@
  */
 
 #import "ccTypes.h"
+#import "CCRendererSharedTypes.h"
 
 
-/// Standard interleaved vertex format for Cocos2D.
-typedef struct CCVertex {
-	/// Vec4 position (x, y, z, w)
-	GLKVector4 position;
-	/// 2xVec2 texture coordinates (x, y)
-	GLKVector2 texCoord1, texCoord2;
-	/// Vec4 color (RGBA)
-	GLKVector4 color;
-} CCVertex;
-
 /// Multiply the vertex's position by the given transform. Pass the rest.
 static inline CCVertex
 CCVertexApplyTransform(CCVertex v, const GLKMatrix4 *transform)
diff --git a/cocos2d/CCRendererSharedTypes.h b/cocos2d/CCRendererSharedTypes.h
@@ -0,0 +1,80 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2013 Apportable Inc.
+ * Copyright (c) 2013-2014 Cocos2D Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This header contains type definitions that are imported into both Obj-C and Metal code.
+
+
+#if __METAL_VERSION__
+#include <simd/simd.h>
+using namespace metal;
+
+// Make aliases for GLKMath types so struct definitions can be shared.
+typedef float2 GLKVector2;
+typedef float3 GLKVector3;
+typedef float4 GLKVector4;
+typedef float2x2 GLKMatrix2;
+typedef float3x3 GLKMatrix3;
+typedef float4x4 GLKMatrix4;
+#endif
+
+/// Standard interleaved vertex format for Cocos2D.
+typedef struct CCVertex {
+	/// Vec4 position (x, y, z, w)
+	GLKVector4 position;
+	/// 2xVec2 texture coordinates (x, y)
+	GLKVector2 texCoord1, texCoord2;
+	/// Vec4 color (RGBA)
+	GLKVector4 color;
+} CCVertex;
+
+#if __METAL_VERSION__
+/// Default vertex shader output for Metal.
+typedef struct CCFragData {
+	float4 position [[position]];
+	float2 texCoord1;
+	float2 texCoord2;
+	half4  color;
+} CCFragData;
+#endif
+
+/// Standard set of global uniform values (used with Metal).
+typedef struct CCGlobalUniforms {
+	/// Projection matrix.
+	GLKMatrix4 projection;
+	/// Inverse of projection matrix.
+	GLKMatrix4 projectionInv;
+	/// Size of the render target in points.
+	GLKVector2 viewSize;
+	/// Size of the render target in pixels.
+	GLKVector2 viewSizeInPixels;
+	/// Current time [t, t/2, t/4, t/8]
+	GLKVector4 time;
+	/// Sine of the current time [sin(t*2), sin(t), sin(t/2), sin(t/4)]
+	GLKVector4 sinTime;
+	/// Cosine of the current time [cos(t*2), cos(t), cos(t/2), cos(t/4)]
+	GLKVector4 cosTime;
+	/// Random per-frame vec4. All components are in the range [0, 1].
+	GLKVector4 random01;
+} CCGlobalUniforms;
diff --git a/cocos2d/CCRenderer_Private.h b/cocos2d/CCRenderer_Private.h
@@ -29,19 +29,6 @@
 #import "CCRenderDispatch.h"
 #import "CCRendererBasicTypes_Private.h"
 
-// Struct used for packing the global uniforms.
-// NOTE: Must match the definition in CCShaders.metal!
-typedef struct CCGlobalUniforms {
-	GLKMatrix4 projection;
-	GLKMatrix4 projectionInv;
-	GLKVector2 viewSize;
-	GLKVector2 viewSizeInPixels;
-	GLKVector4 time;
-	GLKVector4 sinTime;
-	GLKVector4 cosTime;
-	GLKVector4 random01;
-} CCGlobalUniforms;
-
 /// Options dictionary for the disabled blending mode.
 extern NSDictionary *CCBLEND_DISABLED_OPTIONS;
 
diff --git a/cocos2d/Platforms/iOS/CCShaders.metal b/cocos2d/Platforms/iOS/CCShaders.metal
@@ -1,50 +1,35 @@
+/*
+ * cocos2d for iPhone: http://www.cocos2d-iphone.org
+ *
+ * Copyright (c) 2013 Apportable Inc.
+ * Copyright (c) 2013-2014 Cocos2D Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include <metal_stdlib>
 #include <simd/simd.h>
 
+#include "CCRendererSharedTypes.h"
 
 using namespace metal;
 
-
-// Make aliases for GLKMath types so struct definitions can be shared.
-#if __METAL_VERSION__
-typedef float2 GLKVector2;
-typedef float3 GLKVector3;
-typedef float4 GLKVector4;
-typedef float2x2 GLKMatrix2;
-typedef float3x3 GLKMatrix3;
-typedef float4x4 GLKMatrix4;
-#endif
-
-
-
-// Default vertex attributes.
-typedef struct CCVertex {
-	GLKVector4 position;
-	GLKVector2 texCoord1, texCoord2;
-	GLKVector4 color;
-} CCVertex;
-
-// Default fragment varyings.
-typedef struct CCFragData {
-	float4 position [[position]];
-	float2 texCoord1;
-	float2 texCoord2;
-	half4  color;
-} CCFragData;
-
-// Standard set of global uniform values.
-// NOTE: Must match the definition in CCRenderer_Private.h!
-typedef struct CCGlobalUniforms {
-	GLKMatrix4 projection;
-	GLKMatrix4 projectionInv;
-	GLKVector2 viewSize;
-	GLKVector2 viewSizeInPixels;
-	GLKVector4 time;
-	GLKVector4 sinTime;
-	GLKVector4 cosTime;
-	GLKVector4 random01;
-} CCGlobalUniforms;
-
 // Default vertex function.
 vertex CCFragData
 CCVertexFunctionDefault(
