Ivan Safrin 10 лет назад
Родитель
Сommit
bbab4b87ee

BIN
assets/default/hdr.pak


+ 8 - 8
build/osx/TemplateApp/TemplateApp.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		6D6FD3E11BF122A2005AA8E9 /* PolycodeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6D6FD3E01BF122A2005AA8E9 /* PolycodeView.mm */; };
-		6DCDD7231C71B150007E90E1 /* hdr.pak in Resources */ = {isa = PBXBuildFile; fileRef = 6DCDD7221C71B150007E90E1 /* hdr.pak */; };
 		6DCDD7251C724726007E90E1 /* main_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6DCDD7241C724726007E90E1 /* main_icon.png */; };
 		6DD2D0B61BEEDC150026D85C /* libportaudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DD2D0B51BEEDC150026D85C /* libportaudio.a */; };
 		8A825F271B82A2680039E823 /* libportaudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A825F261B82A2680039E823 /* libportaudio.a */; };
@@ -30,13 +29,13 @@
 		8A8653641B72949F009F94DD /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A86535B1B72949F009F94DD /* libz.a */; };
 		8A8653681B7294B7009F94DD /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8653671B7294B7009F94DD /* OpenGL.framework */; };
 		8A86536B1B729559009F94DD /* PolycodeTemplateApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8A86536A1B729559009F94DD /* PolycodeTemplateApp.mm */; };
-		8A8653701B72C431009F94DD /* default.pak in Resources */ = {isa = PBXBuildFile; fileRef = 8A86536F1B72C431009F94DD /* default.pak */; };
 		8A8653961B752DBE009F94DD /* main_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8A8653951B752DBE009F94DD /* main_icon.png */; };
+		8ADFECF61C8E07FB007B57A2 /* hdr.pak in Resources */ = {isa = PBXBuildFile; fileRef = 8ADFECF51C8E07FB007B57A2 /* hdr.pak */; };
+		8ADFECFA1C8E0852007B57A2 /* default.pak in Resources */ = {isa = PBXBuildFile; fileRef = 8ADFECF91C8E0852007B57A2 /* default.pak */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		6D6FD3E01BF122A2005AA8E9 /* PolycodeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PolycodeView.mm; path = ../../../../src/view/osx/PolycodeView.mm; sourceTree = "<group>"; };
-		6DCDD7221C71B150007E90E1 /* hdr.pak */ = {isa = PBXFileReference; lastKnownFileType = file; name = hdr.pak; path = ../../../../assets/default/hdr.pak; sourceTree = "<group>"; };
 		6DCDD7241C724726007E90E1 /* main_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = main_icon.png; path = ../../../../assets/icons/main_icon.png; sourceTree = "<group>"; };
 		6DD2D0B51BEEDC150026D85C /* libportaudio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libportaudio.a; path = ../../../../lib/osx/libportaudio.a; sourceTree = "<group>"; };
 		8A825F261B82A2680039E823 /* libportaudio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libportaudio.a; path = ../../../../lib/osx/libportaudio.a; sourceTree = "<group>"; };
@@ -63,8 +62,9 @@
 		8A8653691B729559009F94DD /* PolycodeTemplateApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolycodeTemplateApp.h; sourceTree = "<group>"; };
 		8A86536A1B729559009F94DD /* PolycodeTemplateApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PolycodeTemplateApp.mm; sourceTree = "<group>"; };
 		8A86536E1B72C301009F94DD /* PolycodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeView.h; path = ../../../../include/polycode/view/osx/PolycodeView.h; sourceTree = "<group>"; };
-		8A86536F1B72C431009F94DD /* default.pak */ = {isa = PBXFileReference; lastKnownFileType = file; name = default.pak; path = ../../../../assets/default/default.pak; sourceTree = "<group>"; };
 		8A8653951B752DBE009F94DD /* main_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = main_icon.png; path = ../../../../assets/icons/main_icon.png; sourceTree = "<group>"; };
+		8ADFECF51C8E07FB007B57A2 /* hdr.pak */ = {isa = PBXFileReference; lastKnownFileType = file; name = hdr.pak; path = ../../../../assets/default/hdr.pak; sourceTree = "<group>"; };
+		8ADFECF91C8E0852007B57A2 /* default.pak */ = {isa = PBXFileReference; lastKnownFileType = file; name = default.pak; path = ../../../../assets/default/default.pak; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -123,8 +123,8 @@
 				8A8653361B72931C009F94DD /* AppDelegate.m */,
 				6D6FD3E01BF122A2005AA8E9 /* PolycodeView.mm */,
 				8A86536E1B72C301009F94DD /* PolycodeView.h */,
-				6DCDD7221C71B150007E90E1 /* hdr.pak */,
-				8A86536F1B72C431009F94DD /* default.pak */,
+				8ADFECF91C8E0852007B57A2 /* default.pak */,
+				8ADFECF51C8E07FB007B57A2 /* hdr.pak */,
 				8A86533A1B72931C009F94DD /* Images.xcassets */,
 				8A8653951B752DBE009F94DD /* main_icon.png */,
 				8A86533C1B72931C009F94DD /* MainMenu.xib */,
@@ -212,10 +212,10 @@
 			files = (
 				8A86533B1B72931C009F94DD /* Images.xcassets in Resources */,
 				8A8653961B752DBE009F94DD /* main_icon.png in Resources */,
+				8ADFECFA1C8E0852007B57A2 /* default.pak in Resources */,
 				8A86533E1B72931C009F94DD /* MainMenu.xib in Resources */,
+				8ADFECF61C8E07FB007B57A2 /* hdr.pak in Resources */,
 				6DCDD7251C724726007E90E1 /* main_icon.png in Resources */,
-				6DCDD7231C71B150007E90E1 /* hdr.pak in Resources */,
-				8A8653701B72C431009F94DD /* default.pak in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 7 - 3
build/osx/TemplateApp/TemplateApp/PolycodeTemplateApp.mm

@@ -27,17 +27,21 @@ PolycodeTemplateApp::PolycodeTemplateApp(PolycodeView *view) {
 //    test->color = Color(2.0, 2.0, 2.0, 1.0);
     scene->addChild(test);
 
+       Camera *camera = scene->getDefaultCamera();
 
     scene->getDefaultCamera()->setPostFilterByName("HDRProcessBloom");
-    Camera *camera = scene->getDefaultCamera();
 
     camera->getShaderPass(0).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "brightThreshold")->setNumber(0.1);
     camera->getShaderPass(1).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.01);
     camera->getShaderPass(2).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.01);
     camera->getShaderPass(3).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "bloomFactor")->setNumber(2.0);
     camera->getShaderPass(3).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "exposure")->setNumber(0.7);
-    
-  //  scene->getDefaultCamera()->setPostFilterByName("Invert");
+ 
+    /*
+    scene->getDefaultCamera()->setPostFilterByName("Blur");
+    camera->getShaderPass(0).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.01);
+    camera->getShaderPass(1).shaderBinding->addParam(ProgramParam::PARAM_NUMBER, "blurSize")->setNumber(0.01);
+    */
 //    Sound *music = new Sound("BUGSHUFFLE.ogg");
   //  music->Play();
     

+ 1 - 1
src/core/PolyCamera.cpp

@@ -403,7 +403,7 @@ ShaderPass Camera::getShaderPass(unsigned int index) {
 }
 
 unsigned int Camera::getNumShaderPasses() {
-    return shaderPasses.size();
+    return (unsigned int) shaderPasses.size();
 }
 
 void Camera::renderFullScreenQuad(GPUDrawBuffer *drawBuffer, int shaderPass) {

+ 1 - 1
src/core/PolyOpenGLGraphicsInterface.cpp

@@ -439,7 +439,7 @@ void OpenGLGraphicsInterface::createTexture(Texture *texture) {
 #ifdef GL_RGBA16F_EXT
             glTextureFormat = GL_RGBA16F_EXT;
 #else
-            glTextureFormat = GL_RGBA16F_ARB;
+            glTextureFormat = GL_RGBA16;
 #endif
             pixelType = GL_FLOAT;
             break;

+ 0 - 3
src/core/PolyRenderer.cpp

@@ -141,7 +141,6 @@ void RenderThread::processDrawBuffer(GPUDrawBuffer *buffer) {
     
     for(int i=0; i < buffer->drawCalls.size(); i++) {
         
-        
         if(buffer->drawCalls[i].options.enableScissor) {
             graphicsInterface->enableScissor(true);
             Polycode::Rectangle scissorBox = buffer->drawCalls[i].options.scissorBox;
@@ -248,8 +247,6 @@ void RenderThread::processDrawBuffer(GPUDrawBuffer *buffer) {
                     buffer->drawCalls[i].shaderPasses[s].setExpectedAttributes();
                     localShaderBinding->resetAttributes = false;
                 }
-                
-                // TODO: this is all garbage, REWRITE
 
                 for(int a=0; a < buffer->drawCalls[i].shaderPasses[s].shaderBinding->getNumAttributeBindings(); a++) {