Improved lightning, debug and other minor changes and improvements

Author: voldien

Common/Common.cpp

@@ -290,7 +290,7 @@ void CommonUtil::updateFrameBuffer(FrameBuffer *framebuffer, const std::initiali
 		const unsigned int depth_depth = depthstencil.depth;
 		const GLenum internal_format = fragcore::GLHelper::getGraphicFormat(depthstencil.graphicFormat);
 
-		GLenum texture_type = GL_TEXTURE_2D;
+		GLenum texture_type = fragcore::GLHelper::getTextureTarget(depthstencil.target);
 		if (multisamples > 1) {
 			texture_type = GL_TEXTURE_2D_MULTISAMPLE;
 		}
@@ -300,8 +300,20 @@ void CommonUtil::updateFrameBuffer(FrameBuffer *framebuffer, const std::initiali
 		if (multisamples > 0) {
 			glTexImage2DMultisample(texture_type, multisamples, internal_format, depth_width, depth_height, GL_TRUE);
 		} else {
-			glTexImage2D(texture_type, 0, internal_format, depth_width, depth_height, 0, GL_DEPTH_COMPONENT, GL_FLOAT,
-						 nullptr);
+			switch (texture_type) {
+			case GL_TEXTURE_2D:
+				glTexImage2D(texture_type, 0, internal_format, depth_width, depth_height, 0, GL_DEPTH_COMPONENT,
+							 GL_FLOAT, nullptr);
+				break;
+			case GL_TEXTURE_CUBE_MAP:
+				for (unsigned int i = 0; i < 6; i++) {
+					glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, internal_format, depth_width, depth_height, 0,
+								 GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
+				}
+				break;
+			default:
+				break;
+			}
 		}
 
 		framebuffer->attachmentSize[framebuffer->depthIndex] = {depth_width, depth_height, depth_depth};
@@ -328,9 +340,15 @@ void CommonUtil::updateFrameBuffer(FrameBuffer *framebuffer, const std::initiali
 		}
 
 		glBindTexture(texture_type, 0);
-
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, texture_type,
-							   framebuffer->attachments[framebuffer->depthIndex], 0);
+		switch (texture_type) {
+		case GL_TEXTURE_2D:
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, texture_type,
+								   framebuffer->attachments[framebuffer->depthIndex], 0);
+			break;
+		case GL_TEXTURE_CUBE_MAP:
+					glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, framebuffer->attachments[framebuffer->depthIndex], 0);
+			break;
+		}
 	}
 
 	/*  Validate if created properly.*/

Common/FPSCounter.h

@@ -24,7 +24,7 @@ namespace glsample {
 	template <typename T = float> class FPSCounter {
 	  public:
 		FPSCounter(const unsigned int nrFPSSample = 50, const size_t timeResolution = 1000000000)
-			: totalFPS(0), fpsSample(nrFPSSample), averageFPS(0), timeResolution(timeResolution) {}
+			: fpsSample(nrFPSSample), timeResolution(timeResolution) {}
 
 		void update(const float elapsedTime) noexcept { this->incrementFPS(elapsedTime); }
 

Common/Importer/ImageImport.cpp

@@ -45,26 +45,27 @@ unsigned int TextureImporter::loadImage2DRaw(const Image &image, const ColorSpac
 
 	this->getFormat(image, format, type, internalformat, colorSpace, compression);
 
+	/*	*/
 	const size_t power_of_2 = std::floor(std::log(Math::max(image.width(), image.height())) / std::log(2));
 	const size_t max_mipmap = Math::clamp<size_t>(power_of_2 - 4, 0, std::numeric_limits<size_t>::max());
 
+	/*	*/
 	GLuint currentPBO = this->pbos[current_pbo++];
 	glBindBuffer(GL_PIXEL_UNPACK_BUFFER, currentPBO);
 	glBufferData(GL_PIXEL_UNPACK_BUFFER, image.getSize(), nullptr, GL_STREAM_COPY);
-	void *ptr = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER_ARB, 0, image.getSize(),
-								 GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+	void *ptr = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER_ARB, 0, image.getSize(), GL_MAP_WRITE_BIT);
 	memcpy(ptr, image.getPixelData(), image.getSize());
 	glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
 
+	/*	*/
 	FVALIDATE_GL_CALL(glGenTextures(1, &texture));
-
 	FVALIDATE_GL_CALL(glBindTexture(target, texture));
 
 	/*	Offload with PBO buffer.	*/
 
 	/*	Alignment.	*/
 	FVALIDATE_GL_CALL(glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
-	FVALIDATE_GL_CALL(glPixelStorei(GL_PACK_ALIGNMENT, 4));
+	FVALIDATE_GL_CALL(glPixelStorei(GL_PACK_ALIGNMENT, 1));
 
 	/*	wrap and filter.	*/
 	FVALIDATE_GL_CALL(glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT));
@@ -100,7 +101,7 @@ unsigned int TextureImporter::loadImage2DRaw(const Image &image, const ColorSpac
 
 	FVALIDATE_GL_CALL(glBindTexture(target, 0));
 
-	current_pbo = (current_pbo + 1) % pbos.size();
+	this->current_pbo = (this->current_pbo + 1) % pbos.size();
 
 	return texture;
 }

Common/Importer/ImageImport.h

@@ -65,16 +65,15 @@ namespace glsample {
 								 const TextureCompression compression = TextureCompression::None);
 
 	  protected:
-	  
 		void getFormat(const Image &image, unsigned int &format, unsigned int &dataType, unsigned int &internalformat,
 					   const ColorSpace colorSpace = ColorSpace::RawLinear,
 					   const TextureCompression compression = TextureCompression::None);
 
 	  private:
 		fragcore::IFileSystem *filesystem = nullptr;
 		fragcore::TaskScheduler *schedular;
-		std::array<unsigned int, 4> pbos = {};
+		std::array<unsigned int, 8> pbos = {};
 		std::atomic_int current_pbo = 0;
 	};
 
-} // namespace glsample
+} // namespace glsample