Fixed Sampler issue for now, Mipmapping is currently not available

Author: Dominik Ospelt

KoRE_GUI.sln

@@ -23,12 +23,12 @@ Global
 		{8CBE9533-CC62-40C0-AADE-AEF468E41D41}.RelWithDebInfo|Win32.Build.0 = Release|Win32
 		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.Debug|Win32.Build.0 = Debug|Win32
-		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
-		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.MinSizeRel|Win32.Build.0 = Release|Win32
 		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.Release|Win32.ActiveCfg = Release|Win32
 		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.Release|Win32.Build.0 = Release|Win32
-		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
-		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{03ADC7CD-D9FA-4B74-ABA0-C4CC0E8868C1}.RelWithDebInfo|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/KoRE/Passes/FrameBufferStage.cpp

@@ -19,7 +19,6 @@
 
 #include "KoRE/Passes/FrameBufferStage.h"
 #include "KoRE/Operations/UseFBO.h"
-#include "KoRE/Operations/ClearOp.h"
 #include "KoRE/ResourceManager.h"
 #include "KoRE/Log.h"
 #include <algorithm>
@@ -93,9 +92,6 @@ void kore::FrameBufferStage::
                    _frameBuffer->getDrawBuffers(),
                    _frameBuffer->numDrawBuffers());
   _internalStartup.push_back(pUseFBO);
-  // temp test
-  ClearOp* pCop = new ClearOp(true,true,true,glm::vec4(1,0,0,1));
-  _internalStartup.push_back(pCop);
 }
 
 void kore::FrameBufferStage::removeProgramPass(ShaderProgramPass* progPass) {

src/KoRE/Texture.cpp

@@ -168,8 +168,8 @@ bool kore::Texture::init(const STextureProperties& properties,
 
 void kore::Texture::genMipmapHierarchy() {
   if (_handle != KORE_GLUINT_HANDLE_INVALID) {
-    glBindTexture(_properties.targetType, _handle);
-    glTexParameteri(_properties.targetType, GL_GENERATE_MIPMAP, GL_TRUE);
-    glGenerateMipmap(_properties.targetType);
+    //glBindTexture(_properties.targetType, _handle);
+    //glTexParameteri(_properties.targetType, GL_GENERATE_MIPMAP, GL_FALSE);
+    //glGenerateMipmap(_properties.targetType);
   }
 }

src/KoRE/TextureSampler.h

@@ -27,7 +27,7 @@ namespace kore {
       type(GL_SAMPLER_2D),
       wrapping(glm::uvec3(GL_REPEAT)),
       magfilter(GL_LINEAR),
-      minfilter(GL_LINEAR_MIPMAP_LINEAR) {
+      minfilter(GL_LINEAR) { //GL_LINEAR_MIPMAP_LINEAR
     }
 
     bool operator== (const TexSamplerProperties& other) const {

src/KoRE_GUI/FrameBufferStageItem.cpp

@@ -34,6 +34,7 @@
 #include "KoRE_GUI/RenderViewer.h"
 
 #include "KoRE/RenderManager.h"
+#include "KoRE/Operations/ClearOp.h"
 
 koregui::FrameBufferStageItem::FrameBufferStageItem(QGraphicsItem* parent)
                                           : _frameBuffer(NULL),
@@ -147,6 +148,19 @@ void koregui::FrameBufferStageItem
   for (uint i = 0; i < sdata.size(); i++) {
     _outputs.push_back(new ShaderDataItem(&sdata[i], NULL, this));
   }
+
+  std::vector<kore::Operation*>& startop =_bufferstage->getStartupOperations();
+  bool hasclear = false;
+  for (uint i = 0; i < startop.size(); i++) {
+    if (startop[i]->getType() == kore::OP_CLEAR) {
+      hasclear = true;
+    }
+  }
+  if(hasclear) {
+    kore::ClearOp* pCop =
+      new kore::ClearOp(true, true, true, glm::vec4(0.1,0.1,0.1,1.0));
+    _bufferstage->addStartupOperation(pCop);
+  }
   refresh();
 }