ソースを参照

Chapter 10 (Mac)

Sanjay Madhav 8 年 前
コミット
b2d5aa91d5

+ 92 - 82
Chapter10/Chapter11-mac.xcodeproj/project.pbxproj → Chapter10/Chapter10-mac.xcodeproj/project.pbxproj

@@ -16,6 +16,9 @@
 		9223C47E1F009428009A94D7 /* Math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4721F009428009A94D7 /* Math.cpp */; };
 		9223C4801F009428009A94D7 /* SpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4761F009428009A94D7 /* SpriteComponent.cpp */; };
 		9223C48B1F0CA3CE009A94D7 /* MoveComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C48A1F0CA3CE009A94D7 /* MoveComponent.cpp */; };
+		92B2F5191FEA28A3009BF7DF /* FPSActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92B2F5081FEA28A0009BF7DF /* FPSActor.cpp */; };
+		92B2F51D1FEA28A3009BF7DF /* CameraComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92B2F50F1FEA28A1009BF7DF /* CameraComponent.cpp */; };
+		92B2F51E1FEA28A3009BF7DF /* FPSCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92B2F5101FEA28A2009BF7DF /* FPSCamera.cpp */; };
 		92CF0D2F1F3BB5270086A0F3 /* AudioComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D1D1F3BB5270086A0F3 /* AudioComponent.cpp */; };
 		92CF0D301F3BB5270086A0F3 /* AudioSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D1F1F3BB5270086A0F3 /* AudioSystem.cpp */; };
 		92CF0D321F3BB5270086A0F3 /* Mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D231F3BB5270086A0F3 /* Mesh.cpp */; };
@@ -24,18 +27,14 @@
 		92CF0D351F3BB5270086A0F3 /* Renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D291F3BB5270086A0F3 /* Renderer.cpp */; };
 		92CF0D361F3BB5270086A0F3 /* SoundEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D2B1F3BB5270086A0F3 /* SoundEvent.cpp */; };
 		92CF0D371F3BB5270086A0F3 /* VertexArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D2D1F3BB5270086A0F3 /* VertexArray.cpp */; };
-		92CF0D4A1F3BB9460086A0F3 /* CameraComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D381F3BB9460086A0F3 /* CameraComponent.cpp */; };
-		92CF0D4D1F3BB9460086A0F3 /* FPSActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D3E1F3BB9460086A0F3 /* FPSActor.cpp */; };
-		92CF0D4E1F3BB9460086A0F3 /* FPSCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D401F3BB9460086A0F3 /* FPSCamera.cpp */; };
-		92CF0D611F3BBAE60086A0F3 /* BallActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D531F3BBAE60086A0F3 /* BallActor.cpp */; };
-		92CF0D621F3BBAE60086A0F3 /* BallMove.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D551F3BBAE60086A0F3 /* BallMove.cpp */; };
-		92CF0D631F3BBAE60086A0F3 /* BoxComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D571F3BBAE60086A0F3 /* BoxComponent.cpp */; };
-		92CF0D641F3BBAE60086A0F3 /* Collision.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D591F3BBAE60086A0F3 /* Collision.cpp */; };
-		92CF0D651F3BBAE60086A0F3 /* PhysWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D5B1F3BBAE60086A0F3 /* PhysWorld.cpp */; };
-		92CF0D661F3BBAE60086A0F3 /* PlayerMove.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D5D1F3BBAE60086A0F3 /* PlayerMove.cpp */; };
-		92CF0D671F3BBAE60086A0F3 /* TargetActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D5F1F3BBAE60086A0F3 /* TargetActor.cpp */; };
 		92D324FB1B697389005A86C7 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92D324FA1B697389005A86C7 /* CoreFoundation.framework */; };
 		92E46E941B6353E50035CD21 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E46E931B6353E50035CD21 /* OpenGL.framework */; };
+		92F20C9F1FEB899300FB489A /* TargetActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92F20C951FEB899100FB489A /* TargetActor.cpp */; };
+		92F20CA01FEB899300FB489A /* BallMove.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92F20C971FEB899200FB489A /* BallMove.cpp */; };
+		92F20CA11FEB899300FB489A /* BoxComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92F20C9B1FEB899200FB489A /* BoxComponent.cpp */; };
+		92F20CA21FEB899300FB489A /* Collision.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92F20C9D1FEB899300FB489A /* Collision.cpp */; };
+		92F20CA31FEB899300FB489A /* BallActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92F20C9E1FEB899300FB489A /* BallActor.cpp */; };
+		92F20CA61FEB89CE00FB489A /* PhysWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92F20CA51FEB89CE00FB489A /* PhysWorld.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -57,6 +56,12 @@
 		9223C4771F009428009A94D7 /* SpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteComponent.h; sourceTree = "<group>"; };
 		9223C48A1F0CA3CE009A94D7 /* MoveComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MoveComponent.cpp; sourceTree = "<group>"; };
 		9223C48C1F0CA3D4009A94D7 /* MoveComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoveComponent.h; sourceTree = "<group>"; };
+		92B2F5081FEA28A0009BF7DF /* FPSActor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FPSActor.cpp; sourceTree = "<group>"; };
+		92B2F50A1FEA28A1009BF7DF /* FPSActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FPSActor.h; sourceTree = "<group>"; };
+		92B2F50F1FEA28A1009BF7DF /* CameraComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CameraComponent.cpp; sourceTree = "<group>"; };
+		92B2F5101FEA28A2009BF7DF /* FPSCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FPSCamera.cpp; sourceTree = "<group>"; };
+		92B2F5131FEA28A2009BF7DF /* FPSCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FPSCamera.h; sourceTree = "<group>"; };
+		92B2F5161FEA28A3009BF7DF /* CameraComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CameraComponent.h; sourceTree = "<group>"; };
 		92CF0D1D1F3BB5270086A0F3 /* AudioComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioComponent.cpp; sourceTree = "<group>"; };
 		92CF0D1E1F3BB5270086A0F3 /* AudioComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioComponent.h; sourceTree = "<group>"; };
 		92CF0D1F1F3BB5270086A0F3 /* AudioSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSystem.cpp; sourceTree = "<group>"; };
@@ -73,29 +78,21 @@
 		92CF0D2C1F3BB5270086A0F3 /* SoundEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundEvent.h; sourceTree = "<group>"; };
 		92CF0D2D1F3BB5270086A0F3 /* VertexArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VertexArray.cpp; sourceTree = "<group>"; };
 		92CF0D2E1F3BB5270086A0F3 /* VertexArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VertexArray.h; sourceTree = "<group>"; };
-		92CF0D381F3BB9460086A0F3 /* CameraComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CameraComponent.cpp; sourceTree = "<group>"; };
-		92CF0D391F3BB9460086A0F3 /* CameraComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CameraComponent.h; sourceTree = "<group>"; };
-		92CF0D3E1F3BB9460086A0F3 /* FPSActor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FPSActor.cpp; sourceTree = "<group>"; };
-		92CF0D3F1F3BB9460086A0F3 /* FPSActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FPSActor.h; sourceTree = "<group>"; };
-		92CF0D401F3BB9460086A0F3 /* FPSCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FPSCamera.cpp; sourceTree = "<group>"; };
-		92CF0D411F3BB9460086A0F3 /* FPSCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FPSCamera.h; sourceTree = "<group>"; };
-		92CF0D531F3BBAE60086A0F3 /* BallActor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BallActor.cpp; sourceTree = "<group>"; };
-		92CF0D541F3BBAE60086A0F3 /* BallActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BallActor.h; sourceTree = "<group>"; };
-		92CF0D551F3BBAE60086A0F3 /* BallMove.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BallMove.cpp; sourceTree = "<group>"; };
-		92CF0D561F3BBAE60086A0F3 /* BallMove.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BallMove.h; sourceTree = "<group>"; };
-		92CF0D571F3BBAE60086A0F3 /* BoxComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoxComponent.cpp; sourceTree = "<group>"; };
-		92CF0D581F3BBAE60086A0F3 /* BoxComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BoxComponent.h; sourceTree = "<group>"; };
-		92CF0D591F3BBAE60086A0F3 /* Collision.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Collision.cpp; sourceTree = "<group>"; };
-		92CF0D5A1F3BBAE60086A0F3 /* Collision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Collision.h; sourceTree = "<group>"; };
-		92CF0D5B1F3BBAE60086A0F3 /* PhysWorld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhysWorld.cpp; sourceTree = "<group>"; };
-		92CF0D5C1F3BBAE60086A0F3 /* PhysWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhysWorld.h; sourceTree = "<group>"; };
-		92CF0D5D1F3BBAE60086A0F3 /* PlayerMove.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerMove.cpp; sourceTree = "<group>"; };
-		92CF0D5E1F3BBAE60086A0F3 /* PlayerMove.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerMove.h; sourceTree = "<group>"; };
-		92CF0D5F1F3BBAE60086A0F3 /* TargetActor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TargetActor.cpp; sourceTree = "<group>"; };
-		92CF0D601F3BBAE60086A0F3 /* TargetActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TargetActor.h; sourceTree = "<group>"; };
 		92D324FA1B697389005A86C7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		92E46DF71B634EA30035CD21 /* Game-mac */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Game-mac"; sourceTree = BUILT_PRODUCTS_DIR; };
 		92E46E931B6353E50035CD21 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
+		92F20C951FEB899100FB489A /* TargetActor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TargetActor.cpp; sourceTree = "<group>"; };
+		92F20C961FEB899200FB489A /* BoxComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BoxComponent.h; sourceTree = "<group>"; };
+		92F20C971FEB899200FB489A /* BallMove.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BallMove.cpp; sourceTree = "<group>"; };
+		92F20C981FEB899200FB489A /* TargetActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TargetActor.h; sourceTree = "<group>"; };
+		92F20C991FEB899200FB489A /* BallMove.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BallMove.h; sourceTree = "<group>"; };
+		92F20C9A1FEB899200FB489A /* Collision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Collision.h; sourceTree = "<group>"; };
+		92F20C9B1FEB899200FB489A /* BoxComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoxComponent.cpp; sourceTree = "<group>"; };
+		92F20C9C1FEB899200FB489A /* BallActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BallActor.h; sourceTree = "<group>"; };
+		92F20C9D1FEB899300FB489A /* Collision.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Collision.cpp; sourceTree = "<group>"; };
+		92F20C9E1FEB899300FB489A /* BallActor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BallActor.cpp; sourceTree = "<group>"; };
+		92F20CA41FEB89CE00FB489A /* PhysWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhysWorld.h; sourceTree = "<group>"; };
+		92F20CA51FEB89CE00FB489A /* PhysWorld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhysWorld.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -114,59 +111,57 @@
 		92E46DEE1B634EA30035CD21 = {
 			isa = PBXGroup;
 			children = (
-				92CF0D531F3BBAE60086A0F3 /* BallActor.cpp */,
-				92CF0D541F3BBAE60086A0F3 /* BallActor.h */,
-				92CF0D551F3BBAE60086A0F3 /* BallMove.cpp */,
-				92CF0D561F3BBAE60086A0F3 /* BallMove.h */,
-				92CF0D571F3BBAE60086A0F3 /* BoxComponent.cpp */,
-				92CF0D581F3BBAE60086A0F3 /* BoxComponent.h */,
-				92CF0D591F3BBAE60086A0F3 /* Collision.cpp */,
-				92CF0D5A1F3BBAE60086A0F3 /* Collision.h */,
-				92CF0D5B1F3BBAE60086A0F3 /* PhysWorld.cpp */,
-				92CF0D5C1F3BBAE60086A0F3 /* PhysWorld.h */,
-				92CF0D5D1F3BBAE60086A0F3 /* PlayerMove.cpp */,
-				92CF0D5E1F3BBAE60086A0F3 /* PlayerMove.h */,
-				92CF0D5F1F3BBAE60086A0F3 /* TargetActor.cpp */,
-				92CF0D601F3BBAE60086A0F3 /* TargetActor.h */,
-				92CF0D381F3BB9460086A0F3 /* CameraComponent.cpp */,
-				92CF0D391F3BB9460086A0F3 /* CameraComponent.h */,
-				92CF0D3E1F3BB9460086A0F3 /* FPSActor.cpp */,
-				92CF0D3F1F3BB9460086A0F3 /* FPSActor.h */,
-				92CF0D401F3BB9460086A0F3 /* FPSCamera.cpp */,
-				92CF0D411F3BB9460086A0F3 /* FPSCamera.h */,
+				9223C4681F009428009A94D7 /* Actor.cpp */,
+				9223C4691F009428009A94D7 /* Actor.h */,
 				92CF0D1D1F3BB5270086A0F3 /* AudioComponent.cpp */,
 				92CF0D1E1F3BB5270086A0F3 /* AudioComponent.h */,
 				92CF0D1F1F3BB5270086A0F3 /* AudioSystem.cpp */,
 				92CF0D201F3BB5270086A0F3 /* AudioSystem.h */,
-				92CF0D231F3BB5270086A0F3 /* Mesh.cpp */,
-				92CF0D241F3BB5270086A0F3 /* Mesh.h */,
-				92CF0D251F3BB5270086A0F3 /* MeshComponent.cpp */,
-				92CF0D261F3BB5270086A0F3 /* MeshComponent.h */,
-				92CF0D271F3BB5270086A0F3 /* PlaneActor.cpp */,
-				92CF0D281F3BB5270086A0F3 /* PlaneActor.h */,
-				92CF0D291F3BB5270086A0F3 /* Renderer.cpp */,
-				92CF0D2A1F3BB5270086A0F3 /* Renderer.h */,
-				92CF0D2B1F3BB5270086A0F3 /* SoundEvent.cpp */,
-				92CF0D2C1F3BB5270086A0F3 /* SoundEvent.h */,
-				92CF0D2D1F3BB5270086A0F3 /* VertexArray.cpp */,
-				92CF0D2E1F3BB5270086A0F3 /* VertexArray.h */,
-				9223C4681F009428009A94D7 /* Actor.cpp */,
-				9223C4691F009428009A94D7 /* Actor.h */,
+				92F20C9E1FEB899300FB489A /* BallActor.cpp */,
+				92F20C9C1FEB899200FB489A /* BallActor.h */,
+				92F20C971FEB899200FB489A /* BallMove.cpp */,
+				92F20C991FEB899200FB489A /* BallMove.h */,
+				92F20C9B1FEB899200FB489A /* BoxComponent.cpp */,
+				92F20C961FEB899200FB489A /* BoxComponent.h */,
+				92B2F50F1FEA28A1009BF7DF /* CameraComponent.cpp */,
+				92B2F5161FEA28A3009BF7DF /* CameraComponent.h */,
+				92F20C9D1FEB899300FB489A /* Collision.cpp */,
+				92F20C9A1FEB899200FB489A /* Collision.h */,
 				9223C46E1F009428009A94D7 /* Component.cpp */,
 				9223C46F1F009428009A94D7 /* Component.h */,
+				92B2F5081FEA28A0009BF7DF /* FPSActor.cpp */,
+				92B2F50A1FEA28A1009BF7DF /* FPSActor.h */,
+				92B2F5101FEA28A2009BF7DF /* FPSCamera.cpp */,
+				92B2F5131FEA28A2009BF7DF /* FPSCamera.h */,
 				9223C4671F009428009A94D7 /* Game.cpp */,
 				9223C4701F009428009A94D7 /* Game.h */,
 				9223C4711F009428009A94D7 /* Main.cpp */,
 				9223C4721F009428009A94D7 /* Math.cpp */,
 				9223C4731F009428009A94D7 /* Math.h */,
+				92CF0D231F3BB5270086A0F3 /* Mesh.cpp */,
+				92CF0D241F3BB5270086A0F3 /* Mesh.h */,
+				92CF0D251F3BB5270086A0F3 /* MeshComponent.cpp */,
+				92CF0D261F3BB5270086A0F3 /* MeshComponent.h */,
 				9223C48A1F0CA3CE009A94D7 /* MoveComponent.cpp */,
 				9223C48C1F0CA3D4009A94D7 /* MoveComponent.h */,
+				92F20CA51FEB89CE00FB489A /* PhysWorld.cpp */,
+				92F20CA41FEB89CE00FB489A /* PhysWorld.h */,
+				92CF0D271F3BB5270086A0F3 /* PlaneActor.cpp */,
+				92CF0D281F3BB5270086A0F3 /* PlaneActor.h */,
+				92CF0D291F3BB5270086A0F3 /* Renderer.cpp */,
+				92CF0D2A1F3BB5270086A0F3 /* Renderer.h */,
 				9206FDC71F140D40005078A2 /* Shader.cpp */,
 				9206FDC81F140D40005078A2 /* Shader.h */,
+				92CF0D2B1F3BB5270086A0F3 /* SoundEvent.cpp */,
+				92CF0D2C1F3BB5270086A0F3 /* SoundEvent.h */,
 				9223C4761F009428009A94D7 /* SpriteComponent.cpp */,
 				9223C4771F009428009A94D7 /* SpriteComponent.h */,
+				92F20C951FEB899100FB489A /* TargetActor.cpp */,
+				92F20C981FEB899200FB489A /* TargetActor.h */,
 				9206FDC41F140707005078A2 /* Texture.cpp */,
 				9206FDC51F140707005078A2 /* Texture.h */,
+				92CF0D2D1F3BB5270086A0F3 /* VertexArray.cpp */,
+				92CF0D2E1F3BB5270086A0F3 /* VertexArray.h */,
 				9206FDC31F13F7E8005078A2 /* Shaders */,
 				92E46DF81B634EA30035CD21 /* Products */,
 				92D324FA1B697389005A86C7 /* CoreFoundation.framework */,
@@ -208,7 +203,7 @@
 		92E46DEF1B634EA30035CD21 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Sanjay Madhav";
 				TargetAttributes = {
 					92E46DF61B634EA30035CD21 = {
@@ -216,7 +211,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter11-mac" */;
+			buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter10-mac" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -245,7 +240,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -d \"$BUILD_DIR/Debug\" ]; then\n    cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Debug\n    cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Debug\n    cp \"$SRCROOT\"/../external/FMOD/lib/mac/*.dylib $BUILD_DIR/Debug\nfi\n\nif [ -d \"$BUILD_DIR/Release\" ]; then\n    cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Release\n    cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Release\n    cp \"$SRCROOT\"/../external/FMOD/lib/mac/*.dylib $BUILD_DIR/Release\nfi";
+			shellScript = "if [ -d \"$BUILD_DIR/Debug\" ]; then\n    cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Debug\n    cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Debug\n    cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib/*.dylib $BUILD_DIR/Debug\n    cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib/*.dylib $BUILD_DIR/Debug\nfi\n\nif [ -d \"$BUILD_DIR/Release\" ]; then\n    cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Release\n    cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Release\n    cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib/*.dylib $BUILD_DIR/Release\n    cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib/*.dylib $BUILD_DIR/Release\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -254,30 +249,29 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92CF0D4E1F3BB9460086A0F3 /* FPSCamera.cpp in Sources */,
 				92CF0D351F3BB5270086A0F3 /* Renderer.cpp in Sources */,
+				92F20C9F1FEB899300FB489A /* TargetActor.cpp in Sources */,
 				9223C47D1F009428009A94D7 /* Main.cpp in Sources */,
 				92CF0D331F3BB5270086A0F3 /* MeshComponent.cpp in Sources */,
+				92F20CA61FEB89CE00FB489A /* PhysWorld.cpp in Sources */,
+				92B2F51E1FEA28A3009BF7DF /* FPSCamera.cpp in Sources */,
 				9223C47E1F009428009A94D7 /* Math.cpp in Sources */,
 				9223C4781F009428009A94D7 /* Game.cpp in Sources */,
-				92CF0D611F3BBAE60086A0F3 /* BallActor.cpp in Sources */,
 				92CF0D2F1F3BB5270086A0F3 /* AudioComponent.cpp in Sources */,
 				92CF0D301F3BB5270086A0F3 /* AudioSystem.cpp in Sources */,
-				92CF0D661F3BBAE60086A0F3 /* PlayerMove.cpp in Sources */,
-				92CF0D651F3BBAE60086A0F3 /* PhysWorld.cpp in Sources */,
+				92B2F5191FEA28A3009BF7DF /* FPSActor.cpp in Sources */,
+				92F20CA21FEB899300FB489A /* Collision.cpp in Sources */,
 				9223C4801F009428009A94D7 /* SpriteComponent.cpp in Sources */,
-				92CF0D641F3BBAE60086A0F3 /* Collision.cpp in Sources */,
 				9223C48B1F0CA3CE009A94D7 /* MoveComponent.cpp in Sources */,
 				9206FDC91F140D40005078A2 /* Shader.cpp in Sources */,
 				92CF0D321F3BB5270086A0F3 /* Mesh.cpp in Sources */,
-				92CF0D4D1F3BB9460086A0F3 /* FPSActor.cpp in Sources */,
+				92B2F51D1FEA28A3009BF7DF /* CameraComponent.cpp in Sources */,
+				92F20CA31FEB899300FB489A /* BallActor.cpp in Sources */,
+				92F20CA01FEB899300FB489A /* BallMove.cpp in Sources */,
 				9223C4791F009428009A94D7 /* Actor.cpp in Sources */,
-				92CF0D621F3BBAE60086A0F3 /* BallMove.cpp in Sources */,
-				92CF0D671F3BBAE60086A0F3 /* TargetActor.cpp in Sources */,
 				92CF0D371F3BB5270086A0F3 /* VertexArray.cpp in Sources */,
+				92F20CA11FEB899300FB489A /* BoxComponent.cpp in Sources */,
 				9223C47C1F009428009A94D7 /* Component.cpp in Sources */,
-				92CF0D631F3BBAE60086A0F3 /* BoxComponent.cpp in Sources */,
-				92CF0D4A1F3BB9460086A0F3 /* CameraComponent.cpp in Sources */,
 				92CF0D361F3BB5270086A0F3 /* SoundEvent.cpp in Sources */,
 				9206FDC61F140707005078A2 /* Texture.cpp in Sources */,
 				92CF0D341F3BB5270086A0F3 /* PlaneActor.cpp in Sources */,
@@ -295,14 +289,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				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;
@@ -340,14 +340,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				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;
@@ -381,14 +387,16 @@
 					"$(SRCROOT)/../external/SDL/include",
 					"$(SRCROOT)/../external/GLEW/include",
 					"$(SRCROOT)/../external/SOIL/include",
-					"$(SRCROOT)/../external/FMOD/include",
 					"$(SRCROOT)/../external/rapidjson/include",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/inc",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/inc",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(SRCROOT)/../external/GLEW/lib/mac",
 					"$(SRCROOT)/../external/SDL/lib/mac",
 					"$(SRCROOT)/../external/SOIL/lib/mac",
-					"$(SRCROOT)/../external/FMOD/lib/mac",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib",
 				);
 				OTHER_LDFLAGS = (
 					"-lGLEW.2.1.0",
@@ -416,14 +424,16 @@
 					"$(SRCROOT)/../external/SDL/include",
 					"$(SRCROOT)/../external/GLEW/include",
 					"$(SRCROOT)/../external/SOIL/include",
-					"$(SRCROOT)/../external/FMOD/include",
 					"$(SRCROOT)/../external/rapidjson/include",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/inc",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/inc",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(SRCROOT)/../external/GLEW/lib/mac",
 					"$(SRCROOT)/../external/SDL/lib/mac",
 					"$(SRCROOT)/../external/SOIL/lib/mac",
-					"$(SRCROOT)/../external/FMOD/lib/mac",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib",
+					"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib",
 				);
 				OTHER_LDFLAGS = (
 					"-lGLEW.2.1.0",
@@ -442,7 +452,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter11-mac" */ = {
+		92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter10-mac" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				92E46DFC1B634EA40035CD21 /* Debug */,

+ 1 - 1
Chapter10/Chapter11-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata → Chapter10/Chapter10-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:/Users/Sanjay/gameprogcpp-solutions/Chapter11/Chapter11-mac.xcodeproj">
+      location = "self:/Users/Sanjay/gameprogcpp-final/Chapter10/Chapter10-mac.xcodeproj">
    </FileRef>
 </Workspace>

+ 7 - 5
Chapter10/Chapter11-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme → Chapter10/Chapter10-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "92E46DF61B634EA30035CD21"
                BuildableName = "Game-mac"
                BlueprintName = "Game-mac"
-               ReferencedContainer = "container:Chapter11-mac.xcodeproj">
+               ReferencedContainer = "container:Chapter10-mac.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -35,7 +36,7 @@
             BlueprintIdentifier = "92E46DF61B634EA30035CD21"
             BuildableName = "Game-mac"
             BlueprintName = "Game-mac"
-            ReferencedContainer = "container:Chapter11-mac.xcodeproj">
+            ReferencedContainer = "container:Chapter10-mac.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "YES"
       customWorkingDirectory = "$(SRCROOT)"
@@ -59,7 +61,7 @@
             BlueprintIdentifier = "92E46DF61B634EA30035CD21"
             BuildableName = "Game-mac"
             BlueprintName = "Game-mac"
-            ReferencedContainer = "container:Chapter11-mac.xcodeproj">
+            ReferencedContainer = "container:Chapter10-mac.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -78,7 +80,7 @@
             BlueprintIdentifier = "92E46DF61B634EA30035CD21"
             BuildableName = "Game-mac"
             BlueprintName = "Game-mac"
-            ReferencedContainer = "container:Chapter11-mac.xcodeproj">
+            ReferencedContainer = "container:Chapter10-mac.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

+ 0 - 2
Chapter10/MoveComponent.cpp

@@ -19,8 +19,6 @@ MoveComponent::MoveComponent(class Actor* owner, int updateOrder)
 
 void MoveComponent::Update(float deltaTime)
 {
-	bool moved = false;
-
 	if (!Math::NearZero(mAngularSpeed))
 	{
 		Quaternion rot = mOwner->GetRotation();