صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
cpp
/
GamePlay
mirrorاز https://github.com/gameplay3d/GamePlay
2
0
انشعاب 0
پرونده‌ها مشکلات 0 ویکی
فهرست منبع

Fix project files and cmake scripts

seanpaultaylor 11 سال پیش
والد
2ea76bc191
کامیت
6bee760b89
7فایلهای تغییر یافته به همراه40 افزوده شده و 81 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 0 2
      gameplay/CMakeLists.txt
  2. 3 1
      gameplay/android/jni/Android.mk
  3. 4 50
      gameplay/gameplay.pro
  4. 2 2
      gameplay/gameplay.xcodeproj/project.pbxproj
  5. 12 10
      samples/browser/CMakeLists.txt
  6. 5 4
      samples/browser/android/jni/Android.mk
  7. 14 12
      samples/browser/sample-browser.pro

+ 0 - 2
gameplay/CMakeLists.txt
مشاهده فایل 

@@ -302,8 +302,6 @@ set(GAMEPLAY_LUA
 
     src/lua/lua_FlowLayout.h
 
     src/lua/lua_Font.cpp
 
     src/lua/lua_Font.h
 
-    src/lua/lua_FontText.cpp
 
-    src/lua/lua_FontText.h
 
     src/lua/lua_Form.cpp
 
     src/lua/lua_Form.h
 
     src/lua/lua_FrameBuffer.cpp

+ 3 - 1
gameplay/android/jni/Android.mk
مشاهده فایل 

@@ -166,14 +166,17 @@ LOCAL_SRC_FILES := \
 
     ScriptController.cpp \
 
     ScriptTarget.cpp \
 
     Slider.cpp \
 
+    Sprite.cpp \
 
     SpriteBatch.cpp \
 
     Technique.cpp \
 
     Terrain.cpp \
 
     TerrainPatch.cpp \
 
+    Text.cpp \
 
     TextBox.cpp \
 
     Texture.cpp \
 
     Theme.cpp \
 
     ThemeStyle.cpp \
 
+    TileSet.cpp \
 
     Transform.cpp \
 
     Vector2.cpp \
 
     Vector3.cpp \
 
@@ -216,7 +219,6 @@ LOCAL_SRC_FILES := \
 
     lua/lua_FileSystem.cpp \
 
     lua/lua_FlowLayout.cpp \
 
     lua/lua_Font.cpp \
 
-    lua/lua_FontText.cpp \
 
     lua/lua_Form.cpp \
 
     lua/lua_FrameBuffer.cpp \
 
     lua/lua_Frustum.cpp \

+ 4 - 50
gameplay/gameplay.pro
مشاهده فایل 

@@ -120,14 +120,17 @@ SOURCES += src/AbsoluteLayout.cpp \
 
     src/ScriptController.inl \
 
     src/ScriptTarget.cpp \
 
     src/Slider.cpp \
 
+    src/Sprite.cpp \
 
     src/SpriteBatch.cpp \
 
     src/Technique.cpp \
 
     src/Terrain.cpp \
 
     src/TerrainPatch.cpp \
 
+    src/Text.cpp \
 
     src/TextBox.cpp \
 
     src/Texture.cpp \
 
     src/Theme.cpp \
 
     src/ThemeStyle.cpp \
 
+    src/TileSet.cpp \
 
     src/Transform.cpp \
 
     src/Vector2.cpp \
 
     src/Vector2.inl \
 
@@ -138,20 +141,18 @@ SOURCES += src/AbsoluteLayout.cpp \
 
     src/VertexAttributeBinding.cpp \
 
     src/VertexFormat.cpp \
 
     src/VerticalLayout.cpp \
 
+    src/lua/lua_all_bindings.cpp \
 
     src/lua/lua_AbsoluteLayout.cpp \
 
     src/lua/lua_AIAgent.cpp \
 
     src/lua/lua_AIAgentListener.cpp \
 
     src/lua/lua_AIController.cpp \
 
     src/lua/lua_AIMessage.cpp \
 
-    src/lua/lua_AIMessageParameterType.cpp \
 
     src/lua/lua_AIState.cpp \
 
     src/lua/lua_AIStateListener.cpp \
 
     src/lua/lua_AIStateMachine.cpp \
 
-    src/lua/lua_all_bindings.cpp \
 
     src/lua/lua_Animation.cpp \
 
     src/lua/lua_AnimationClip.cpp \
 
     src/lua/lua_AnimationClipListener.cpp \
 
-    src/lua/lua_AnimationClipListenerEventType.cpp \
 
     src/lua/lua_AnimationController.cpp \
 
     src/lua/lua_AnimationTarget.cpp \
 
     src/lua/lua_AnimationValue.cpp \
 
@@ -159,98 +160,67 @@ SOURCES += src/AbsoluteLayout.cpp \
 
     src/lua/lua_AudioController.cpp \
 
     src/lua/lua_AudioListener.cpp \
 
     src/lua/lua_AudioSource.cpp \
 
-    src/lua/lua_AudioSourceState.cpp \
 
     src/lua/lua_BoundingBox.cpp \
 
     src/lua/lua_BoundingSphere.cpp \
 
     src/lua/lua_Bundle.cpp \
 
     src/lua/lua_Button.cpp \
 
     src/lua/lua_Camera.cpp \
 
     src/lua/lua_CameraListener.cpp \
 
-    src/lua/lua_CameraType.cpp \
 
     src/lua/lua_CheckBox.cpp \
 
     src/lua/lua_Container.cpp \
 
     src/lua/lua_ContainerDirection.cpp \
 
     src/lua/lua_ContainerScroll.cpp \
 
     src/lua/lua_Control.cpp \
 
-    src/lua/lua_ControlAlignment.cpp \
 
-    src/lua/lua_ControlAutoSize.cpp \
 
     src/lua/lua_ControlListener.cpp \
 
-    src/lua/lua_ControlListenerEventType.cpp \
 
-    src/lua/lua_ControlState.cpp \
 
     src/lua/lua_Curve.cpp \
 
-    src/lua/lua_CurveInterpolationType.cpp \
 
     src/lua/lua_DepthStencilTarget.cpp \
 
-    src/lua/lua_DepthStencilTargetFormat.cpp \
 
     src/lua/lua_Effect.cpp \
 
     src/lua/lua_FileSystem.cpp \
 
     src/lua/lua_FlowLayout.cpp \
 
     src/lua/lua_Font.cpp \
 
-    src/lua/lua_FontFormat.cpp \
 
-    src/lua/lua_FontJustify.cpp \
 
-    src/lua/lua_FontStyle.cpp \
 
-    src/lua/lua_FontText.cpp \
 
     src/lua/lua_Form.cpp \
 
     src/lua/lua_FrameBuffer.cpp \
 
     src/lua/lua_Frustum.cpp \
 
     src/lua/lua_Game.cpp \
 
-    src/lua/lua_GameClearFlags.cpp \
 
     src/lua/lua_Gamepad.cpp \
 
-    src/lua/lua_GamepadButtonMapping.cpp \
 
-    src/lua/lua_GamepadGamepadEvent.cpp \
 
-    src/lua/lua_GameState.cpp \
 
     src/lua/lua_Gesture.cpp \
 
-    src/lua/lua_GestureGestureEvent.cpp \
 
     src/lua/lua_Global.cpp \
 
     src/lua/lua_HeightField.cpp \
 
     src/lua/lua_Image.cpp \
 
     src/lua/lua_ImageControl.cpp \
 
-    src/lua/lua_ImageFormat.cpp \
 
     src/lua/lua_Joint.cpp \
 
     src/lua/lua_JoystickControl.cpp \
 
     src/lua/lua_Keyboard.cpp \
 
-    src/lua/lua_KeyboardKey.cpp \
 
-    src/lua/lua_KeyboardKeyEvent.cpp \
 
     src/lua/lua_Label.cpp \
 
     src/lua/lua_Layout.cpp \
 
-    src/lua/lua_LayoutType.cpp \
 
     src/lua/lua_Light.cpp \
 
-    src/lua/lua_LightType.cpp \
 
     src/lua/lua_Logger.cpp \
 
-    src/lua/lua_LoggerLevel.cpp \
 
     src/lua/lua_Material.cpp \
 
     src/lua/lua_MaterialParameter.cpp \
 
     src/lua/lua_MathUtil.cpp \
 
     src/lua/lua_Matrix.cpp \
 
     src/lua/lua_Mesh.cpp \
 
     src/lua/lua_MeshBatch.cpp \
 
-    src/lua/lua_MeshIndexFormat.cpp \
 
     src/lua/lua_MeshPart.cpp \
 
-    src/lua/lua_MeshPrimitiveType.cpp \
 
     src/lua/lua_MeshSkin.cpp \
 
     src/lua/lua_Model.cpp \
 
     src/lua/lua_Mouse.cpp \
 
-    src/lua/lua_MouseMouseEvent.cpp \
 
     src/lua/lua_Node.cpp \
 
     src/lua/lua_NodeCloneContext.cpp \
 
     src/lua/lua_NodeType.cpp \
 
     src/lua/lua_ParticleEmitter.cpp \
 
-    src/lua/lua_ParticleEmitterBlendMode.cpp \
 
     src/lua/lua_Pass.cpp \
 
     src/lua/lua_PhysicsCharacter.cpp \
 
     src/lua/lua_PhysicsCollisionObject.cpp \
 
     src/lua/lua_PhysicsCollisionObjectCollisionListener.cpp \
 
-    src/lua/lua_PhysicsCollisionObjectCollisionListenerEventType.cpp \
 
     src/lua/lua_PhysicsCollisionObjectCollisionPair.cpp \
 
-    src/lua/lua_PhysicsCollisionObjectType.cpp \
 
     src/lua/lua_PhysicsCollisionShape.cpp \
 
     src/lua/lua_PhysicsCollisionShapeDefinition.cpp \
 
-    src/lua/lua_PhysicsCollisionShapeType.cpp \
 
     src/lua/lua_PhysicsConstraint.cpp \
 
     src/lua/lua_PhysicsController.cpp \
 
     src/lua/lua_PhysicsControllerHitFilter.cpp \
 
     src/lua/lua_PhysicsControllerHitResult.cpp \
 
     src/lua/lua_PhysicsControllerListener.cpp \
 
-    src/lua/lua_PhysicsControllerListenerEventType.cpp \
 
     src/lua/lua_PhysicsFixedConstraint.cpp \
 
     src/lua/lua_PhysicsGenericConstraint.cpp \
 
     src/lua/lua_PhysicsGhostObject.cpp \
 
@@ -264,7 +234,6 @@ SOURCES += src/AbsoluteLayout.cpp \
 
     src/lua/lua_Plane.cpp \
 
     src/lua/lua_Platform.cpp \
 
     src/lua/lua_Properties.cpp \
 
-    src/lua/lua_PropertiesType.cpp \
 
     src/lua/lua_Quaternion.cpp \
 
     src/lua/lua_RadioButton.cpp \
 
     src/lua/lua_Ray.cpp \
 
@@ -272,13 +241,7 @@ SOURCES += src/AbsoluteLayout.cpp \
 
     src/lua/lua_Ref.cpp \
 
     src/lua/lua_RenderState.cpp \
 
     src/lua/lua_RenderStateAutoBinding.cpp \
 
-    src/lua/lua_RenderStateBlend.cpp \
 
-    src/lua/lua_RenderStateCullFaceSide.cpp \
 
-    src/lua/lua_RenderStateDepthFunction.cpp \
 
-    src/lua/lua_RenderStateFrontFace.cpp \
 
     src/lua/lua_RenderStateStateBlock.cpp \
 
-    src/lua/lua_RenderStateStencilFunction.cpp \
 
-    src/lua/lua_RenderStateStencilOperation.cpp \
 
     src/lua/lua_RenderTarget.cpp \
 
     src/lua/lua_Scene.cpp \
 
     src/lua/lua_ScreenDisplayer.cpp \
 
@@ -288,24 +251,16 @@ SOURCES += src/AbsoluteLayout.cpp \
 
     src/lua/lua_SpriteBatch.cpp \
 
     src/lua/lua_Technique.cpp \
 
     src/lua/lua_Terrain.cpp \
 
-    src/lua/lua_TerrainFlags.cpp \
 
     src/lua/lua_TerrainPatch.cpp \
 
     src/lua/lua_TextBox.cpp \
 
-    src/lua/lua_TextBoxInputMode.cpp \
 
     src/lua/lua_Texture.cpp \
 
-    src/lua/lua_TextureCubeFace.cpp \
 
-    src/lua/lua_TextureFilter.cpp \
 
-    src/lua/lua_TextureFormat.cpp \
 
     src/lua/lua_TextureSampler.cpp \
 
-    src/lua/lua_TextureType.cpp \
 
-    src/lua/lua_TextureWrap.cpp \
 
     src/lua/lua_Theme.cpp \
 
     src/lua/lua_ThemeSideRegions.cpp \
 
     src/lua/lua_ThemeStyle.cpp \
 
     src/lua/lua_ThemeThemeImage.cpp \
 
     src/lua/lua_ThemeUVs.cpp \
 
     src/lua/lua_Touch.cpp \
 
-    src/lua/lua_TouchTouchEvent.cpp \
 
     src/lua/lua_Transform.cpp \
 
     src/lua/lua_TransformListener.cpp \
 
     src/lua/lua_Uniform.cpp \
 
@@ -315,7 +270,6 @@ SOURCES += src/AbsoluteLayout.cpp \
 
     src/lua/lua_VertexAttributeBinding.cpp \
 
     src/lua/lua_VertexFormat.cpp \
 
     src/lua/lua_VertexFormatElement.cpp \
 
-    src/lua/lua_VertexFormatUsage.cpp \
 
     src/lua/lua_VerticalLayout.cpp
 
 
 HEADERS += src/AbsoluteLayout.h \

+ 2 - 2
gameplay/gameplay.xcodeproj/project.pbxproj
مشاهده فایل 

@@ -1582,8 +1582,6 @@
 
 				42CC55321809A4EE00AAD8AD /* Slider.h */,
 
 				4204EC441A2F878C0074FCE9 /* Sprite.cpp */,
 
 				4204EC431A2F70BA0074FCE9 /* Sprite.h */,
 
-				4204EC3F1A2EB8310074FCE9 /* TileSet.cpp */,
 
-				4204EC401A2EB8310074FCE9 /* TileSet.h */,
 
 				42CC55451809A4EE00AAD8AD /* SpriteBatch.cpp */,
 
 				42CC55461809A4EE00AAD8AD /* SpriteBatch.h */,
 
 				42CC55471809A4EE00AAD8AD /* Stream.h */,
 
@@ -1603,6 +1601,8 @@
 
 				42CC55531809A4EE00AAD8AD /* Theme.h */,
 
 				42CC55541809A4EE00AAD8AD /* ThemeStyle.cpp */,
 
 				42CC55551809A4EE00AAD8AD /* ThemeStyle.h */,
 
+				4204EC3F1A2EB8310074FCE9 /* TileSet.cpp */,
 
+				4204EC401A2EB8310074FCE9 /* TileSet.h */,
 
 				42CC55561809A4EE00AAD8AD /* TimeListener.h */,
 
 				42CC55571809A4EE00AAD8AD /* Touch.h */,
 
 				42CC55581809A4EE00AAD8AD /* Transform.cpp */,

+ 12 - 10
samples/browser/CMakeLists.txt
مشاهده فایل 

@@ -5,10 +5,10 @@ set(GAME_SRC
 
     src/Audio3DSample.h
 
     src/BillboardSample.cpp
 
     src/BillboardSample.h
 
-    src/CreateSceneSample.cpp
 
-    src/CreateSceneSample.h
 
     src/FirstPersonCamera.cpp
 
     src/FirstPersonCamera.h
 
+    src/FontSample.cpp
 
+    src/FontSample.h
 
     src/FormsSample.cpp
 
     src/FormsSample.h
 
     src/GamepadSample.cpp
 
@@ -21,8 +21,6 @@ set(GAME_SRC
 
     src/InputSample.h
 
     src/LightSample.cpp
 
     src/LightSample.h
 
-    src/LoadSceneSample.cpp
 
-    src/LoadSceneSample.h
 
     src/MeshBatchSample.cpp
 
     src/MeshBatchSample.h
 
     src/MeshPrimitiveSample.cpp
 
@@ -33,16 +31,20 @@ set(GAME_SRC
 
     src/PhysicsCollisionObjectSample.h
 
     src/PostProcessSample.cpp
 
     src/PostProcessSample.h
 
-    src/SpriteBatchSample.cpp
 
-    src/SpriteBatchSample.h
 
-    src/TerrainSample.cpp
 
-    src/TerrainSample.h
 
     src/Sample.cpp
 
     src/Sample.h
 
     src/SamplesGame.cpp
 
     src/SamplesGame.h
 
-    src/TextSample.cpp
 
-    src/TextSample.h
 
+    src/SceneCreateSample.cpp
 
+    src/SceneCreateSample.h
 
+    src/SceneLoadSample.cpp
 
+    src/SceneLoadSample.h
 
+    src/SpriteBatchSample.cpp
 
+    src/SpriteBatchSample.h
 
+    src/SpriteSample.cpp
 
+    src/SpriteSample.h
 
+    src/TerrainSample.cpp
 
+    src/TerrainSample.h
 
     src/TextureSample.cpp
 
     src/TextureSample.h
 
     src/TriangleSample.cpp

+ 5 - 4
samples/browser/android/jni/Android.mk
مشاهده فایل 

@@ -91,21 +91,22 @@ LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp \
 
     SamplesGame.cpp \
 
     Audio3DSample.cpp \
 
     BillboardSample.cpp \
 
-    CreateSceneSample.cpp \
 
+    FontSample.cpp \
 
     FormsSample.cpp \
 
     GestureSample.cpp \
 
     GamepadSample.cpp \
 
     InputSample.cpp \
 
     LightSample.cpp \
 
-    LoadSceneSample.cpp \
 
     MeshBatchSample.cpp \
 
     MeshPrimitiveSample.cpp \
 
-	ParticlesSample.cpp \
 
+    ParticlesSample.cpp \
 
     PhysicsCollisionObjectSample.cpp \
 
     PostProcessSample.cpp \
 
+    SceneCreateSample.cpp \
 
+    SceneLoadSample.cpp \
 
     SpriteBatchSample.cpp \
 
+    SpriteSample.cpp \
 
     TerrainSample.cpp \
 
-    TextSample.cpp \
 
     TextureSample.cpp \
 
     TriangleSample.cpp \
 
     WaterSample.cpp

+ 14 - 12
samples/browser/sample-browser.pro
مشاهده فایل 

@@ -11,50 +11,52 @@ TEMPLATE = app
 
 
 SOURCES += src/Audio3DSample.cpp \
 
     src/BillboardSample.cpp \
 
-    src/CreateSceneSample.cpp \
 
     src/FirstPersonCamera.cpp \
 
+    src/FontSample.cpp \
 
     src/FormsSample.cpp \
 
     src/GamepadSample.cpp \
 
     src/GestureSample.cpp \
 
     src/Grid.cpp \
 
     src/InputSample.cpp \
 
     src/LightSample.cpp \
 
-    src/LoadSceneSample.cpp \
 
     src/MeshBatchSample.cpp \
 
     src/MeshPrimitiveSample.cpp \
 
-	src/ParticlesSample.cpp \
 
+    src/ParticlesSample.cpp \
 
     src/PhysicsCollisionObjectSample.cpp \
 
     src/PostProcessSample.cpp \
 
-    src/SpriteBatchSample.cpp \
 
-    src/TerrainSample.cpp \
 
     src/Sample.cpp \
 
     src/SamplesGame.cpp \
 
-    src/TextSample.cpp \
 
+    src/SceneCreateSample.cpp \
 
+    src/SceneLoadSample.cpp \
 
+    src/SpriteBatchSample.cpp \
 
+    src/SpriteSample.cpp \
 
+    src/TerrainSample.cpp \
 
     src/TextureSample.cpp \
 
     src/TriangleSample.cpp \
 
     src/WaterSample.cpp
 
 
 HEADERS += src/Audio3DSample.h \
 
     src/BillboardSample.h \
 
-    src/CreateSceneSample.h \
 
     src/FirstPersonCamera.h \
 
+    src/FontSample.h \
 
     src/FormsSample.h \
 
     src/GamepadSample.h \
 
     src/GestureSample.h \
 
     src/Grid.h \
 
     src/InputSample.h \
 
     src/LightSample.h \
 
-    src/LoadSceneSample.h \
 
     src/MeshBatchSample.h \
 
     src/MeshPrimitiveSample.h \
 
-	src/ParticlesSample.h \
 
+    src/ParticlesSample.h \
 
     src/PhysicsCollisionObjectSample.h \
 
     src/PostProcessSample.h \
 
-    src/SpriteBatchSample.h \
 
-    src/TerrainSample.h \
 
     src/Sample.h \
 
     src/SamplesGame.h \
 
-    src/TextSample.h \
 
+    src/SceneCreateSample.h \
 
+    src/SceneLoadSample.h \
 
+    src/SpriteBatchSample.h \
 
+    src/SpriteSample.h \
 
+    src/TerrainSample.h \
 
     src/TextureSample.h \
 
     src/TriangleSample.h \
 
     src/WaterSample.h