فهرست منبع

Added accessors for local shader options in camera for Lua, added hdr pack to player on Mac

Ivan Safrin 11 سال پیش
والد
کامیت
e014f65a05
3فایلهای تغییر یافته به همراه18 افزوده شده و 0 حذف شده
  1. 3 0
      Core/Contents/Include/PolyCamera.h
  2. 11 0
      Core/Contents/Source/PolyCamera.cpp
  3. 4 0
      Player/Contents/CMakeLists.txt

+ 3 - 0
Core/Contents/Include/PolyCamera.h

@@ -185,6 +185,9 @@ namespace Polycode {
 			*/
 			std::vector<ShaderBinding*> getLocalShaderOptions() { return localShaderOptions; }
 			
+            unsigned int getNumLocalShaderOptions() const;
+            ShaderBinding* getLocalShaderOption(unsigned int index) const;
+        
 			/**
 			* Returns the shader material applied to the camera.
 			*/			

+ 11 - 0
Core/Contents/Source/PolyCamera.cpp

@@ -136,6 +136,17 @@ Number Camera::getOrthoSizeY() {
 	return orthoSizeY;
 }
 
+unsigned int Camera::getNumLocalShaderOptions()const {
+    return localShaderOptions.size();
+}
+
+ShaderBinding* Camera::getLocalShaderOption(unsigned int index) const {
+    if(index < localShaderOptions.size()) {
+        return localShaderOptions[index];
+    } else {
+        return NULL;
+    }
+}
 
 void Camera::buildFrustumPlanes() {
 

+ 4 - 0
Player/Contents/CMakeLists.txt

@@ -283,6 +283,8 @@ endif()
                       COMMAND cp ${Polycode_SOURCE_DIR}/Player/Contents/Platform/Darwin/player_icon.icns ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
 	add_custom_command (TARGET PolycodePlayer PRE_BUILD
                       COMMAND cp ${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/default.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
+    add_custom_command (TARGET PolycodePlayer PRE_BUILD
+                      COMMAND cp ${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/hdr.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)                      
 	add_custom_command (TARGET PolycodePlayer PRE_BUILD
                       COMMAND cp -R ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/API/api.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
 	add_custom_command (TARGET PolycodePlayer PRE_BUILD
@@ -300,6 +302,8 @@ endif()
                       COMMAND cp ${Polycode_SOURCE_DIR}/Player/Contents/Platform/Darwin/player_icon.icns ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
 	add_custom_command (TARGET StandalonePlayer PRE_BUILD
                       COMMAND cp ${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/default.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
+    add_custom_command (TARGET StandalonePlayer PRE_BUILD
+                      COMMAND cp ${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/hdr.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)            
 	add_custom_command (TARGET StandalonePlayer PRE_BUILD
                       COMMAND cp -R ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/API/api.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
 	add_custom_command (TARGET StandalonePlayer PRE_BUILD