sync commit

Author: Dominik Ospelt

assets/meshes/FullscreenTriangle.dae

@@ -5,8 +5,8 @@
       <author>Blender User</author>
       <authoring_tool>Blender 2.66.1 r55078</authoring_tool>
     </contributor>
-    <created>2013-05-19T18:19:26</created>
-    <modified>2013-05-19T18:19:26</modified>
+    <created>2013-06-07T16:55:25</created>
+    <modified>2013-06-07T16:55:25</modified>
     <unit name="meter" meter="1"/>
     <up_axis>Z_UP</up_axis>
   </asset>
@@ -15,7 +15,7 @@
     <geometry id="Triangle-mesh" name="Triangle">
       <mesh>
         <source id="Triangle-mesh-positions">
-          <float_array id="Triangle-mesh-positions-array" count="9">3 -1 0 -1 -1 0 -1 3 0</float_array>
+          <float_array id="Triangle-mesh-positions-array" count="9">2 0 0 0 0 0 0 2 0</float_array>
           <technique_common>
             <accessor source="#Triangle-mesh-positions-array" count="3" stride="3">
               <param name="X" type="float"/>
@@ -25,7 +25,7 @@
           </technique_common>
         </source>
         <source id="Triangle-mesh-normals">
-          <float_array id="Triangle-mesh-normals-array" count="3">0 0 -1</float_array>
+          <float_array id="Triangle-mesh-normals-array" count="3">0 0 1</float_array>
           <technique_common>
             <accessor source="#Triangle-mesh-normals-array" count="1" stride="3">
               <param name="X" type="float"/>
@@ -34,24 +34,14 @@
             </accessor>
           </technique_common>
         </source>
-        <source id="Triangle-mesh-map-0">
-          <float_array id="Triangle-mesh-map-0-array" count="6">0 2 2 0 0 0</float_array>
-          <technique_common>
-            <accessor source="#Triangle-mesh-map-0-array" count="3" stride="2">
-              <param name="S" type="float"/>
-              <param name="T" type="float"/>
-            </accessor>
-          </technique_common>
-        </source>
         <vertices id="Triangle-mesh-vertices">
           <input semantic="POSITION" source="#Triangle-mesh-positions"/>
         </vertices>
         <polylist count="1">
           <input semantic="VERTEX" source="#Triangle-mesh-vertices" offset="0"/>
           <input semantic="NORMAL" source="#Triangle-mesh-normals" offset="1"/>
-          <input semantic="TEXCOORD" source="#Triangle-mesh-map-0" offset="2" set="0"/>
           <vcount>3 </vcount>
-          <p>2 0 0 0 0 1 1 0 2</p>
+          <p>1 0 0 0 2 0</p>
         </polylist>
       </mesh>
       <extra><technique profile="MAYA"><double_sided>1</double_sided></technique></extra>

assets/meshes/JustATest.dae

@@ -0,0 +1,10 @@
+#version 330
+out vec4 out_color;
+
+in vec2 UV;
+uniform sampler2D tex;
+
+void main(void)
+{
+  out_color = texture(tex, UV);
+}

assets/shader/FullScreen.fp

@@ -0,0 +1,12 @@
+#version 330
+// vertex position in modelspace
+layout(location = 0) in vec3 v_position;
+
+out vec2 UV;
+
+void main()
+{
+  vec3 biased = v_position * 2.0f + vec3(-1, -1, 0);
+  gl_Position = vec4(biased, 1.0f);
+  UV = v_position.xy;
+}

assets/shader/FullScreen.vp

@@ -126,7 +126,7 @@ bool koregui::BindPathItem::initBinding(void) {
       }
       kore::RenderMesh* _renderOP = new kore::RenderMesh(
         static_cast<kore::MeshComponent*>(_start->getData()->component));
-      nodePass->addOperation(_renderOP);
+      nodePass->addFinishOperation(_renderOP);
     }
    return true;
   }
@@ -162,13 +162,19 @@ void koregui::BindPathItem::removeBinding() {
   std::vector<kore::NodePass*> npasses =
     _end->getShaderPass()->getProgramPass()->getNodePasses();
   for (uint i = 0; i < npasses.size(); i++) {
-    if(npasses[i]->getSceneNode() == _start->getNodeItem()->getSceneNode()) {
+    if(_start->getNodeItem() &&
+       npasses[i]->getSceneNode() == _start->getNodeItem()->getSceneNode()) {
       nodePass = npasses[i];
       break;
     }
   }
   if (nodePass) {
     nodePass->removeOperation(_bindOP);
+    if(nodePass->getOperations().size() == 0) {
+      _end->getShaderPass()->getProgramPass()->removeNodePass(nodePass);
+    }
+  } else {
+    _end->getShaderPass()->getProgramPass()->removeStartupOperation(_bindOP);
   }
 }
 

src/KoRE_GUI/BindPathItem.cpp

@@ -143,7 +143,7 @@ void koregui::FrameBufferStageItem
     delete(_outputs[i]);
   }
   _outputs.clear();
-  std::vector<kore::ShaderData> sdata = _frameBuffer->getOutputs();
+  std::vector<kore::ShaderData>& sdata = _frameBuffer->getOutputs();
   for (uint i = 0; i < sdata.size(); i++) {
     _outputs.push_back(new ShaderDataItem(&sdata[i], NULL, this));
   }

src/KoRE_GUI/FrameBufferStageItem.cpp

@@ -84,6 +84,7 @@ void GLWidget::initializeGL() {
     // enable culling and depthtest
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
+    glEnable(GL_TEXTURE_2D);
     glCullFace(GL_BACK);
 }