Added mipmapping partially

src/render/FrameBuffer.cpp

@@ -4,24 +4,30 @@
 
 namespace ZL {
 
-    FrameBuffer::FrameBuffer(int w, int h) : width(w), height(h) {
-        // 1. Ñîçäàåì FBO
+    FrameBuffer::FrameBuffer(int w, int h, bool useMipmaps)
+        : width(w), height(h), useMipmaps(useMipmaps) {
+
         glGenFramebuffers(1, &fbo);
         glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 
-        // 2. Ñîçäàåì òåêñòóðó, êóäà áóäåì "ôîòîãðàôèðîâàòü"
         glGenTextures(1, &textureID);
         glBindTexture(GL_TEXTURE_2D, textureID);
 
-        // Óñòàíàâëèâàåì ïàðàìåòðû òåêñòóðû
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+
+        // Íàñòðàèâàåì ôèëüòðàöèþ
+        if (useMipmaps) {
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+            // Ñðàçó ãåíåðèðóåì ïóñòûå óðîâíè, ÷òîáû òåêñòóðà ñ÷èòàëàñü "ïîëíîé"
+            glGenerateMipmap(GL_TEXTURE_2D);
+        }
+        else {
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        }
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-        // 3. Ïðèâÿçûâàåì òåêñòóðó ê FBO
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textureID, 0);
 
-        // Ïðîâåðêà ãîòîâíîñòè
         if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
             std::cerr << "Error: Framebuffer is not complete!" << std::endl;
         }
@@ -34,6 +40,13 @@ namespace ZL {
         glDeleteTextures(1, &textureID);
     }
 
+    void FrameBuffer::GenerateMipmaps() {
+        if (useMipmaps) {
+            glBindTexture(GL_TEXTURE_2D, textureID);
+            glGenerateMipmap(GL_TEXTURE_2D);
+        }
+    }
+
     void FrameBuffer::Bind() {
         glBindFramebuffer(GL_FRAMEBUFFER, fbo);
         glViewport(0, 0, width, height); // Âàæíî: óñòàíàâëèâàåì âüþïîðò ïîä ðàçìåð òåêñòóðû

src/render/FrameBuffer.h

@@ -9,17 +9,21 @@ namespace ZL {
         GLuint fbo = 0;
         GLuint textureID = 0;
         int width, height;
+        bool useMipmaps; // Ôëàã èñïîëüçîâàíèÿ ìèï-ìàïîâ
 
     public:
-        FrameBuffer(int w, int h);
+        // Äîáàâëÿåì ïàðàìåòð â êîíñòðóêòîð ïî óìîë÷àíèþ false
+        FrameBuffer(int w, int h, bool useMipmaps = false);
         ~FrameBuffer();
 
-        // Çàïðåùàåì êîïèðîâàíèå, êàê â VBOHolder
         FrameBuffer(const FrameBuffer&) = delete;
         FrameBuffer& operator=(const FrameBuffer&) = delete;
 
-        void Bind();   // Íà÷àòü ðåíäåð â ýòîò áóôåð
-        void Unbind(); // Âåðíóòüñÿ ê îáû÷íîìó ðåíäåðó â ýêðàí
+        void Bind();
+        void Unbind();
+
+        // Ìåòîä äëÿ ïðèíóäèòåëüíîé ãåíåðàöèè ìèï-ìàïîâ ïîñëå ðåíäåðà
+        void GenerateMipmaps();
 
         GLuint getTextureID() const { return textureID; }
         int getWidth() const { return width; }

src/render/TextureManager.cpp

@@ -8,44 +8,46 @@
 namespace ZL
 {
 
-	Texture::Texture(const TextureDataStruct& texData)
-	{
-
+	Texture::Texture(const TextureDataStruct& texData) {
 		width = texData.width;
 		height = texData.height;
 
 		glGenTextures(1, &texID);
-
-		if (texID == 0)
-		{
+		if (texID == 0) {
 			throw std::runtime_error("glGenTextures did not work");
 		}
 
 		glBindTexture(GL_TEXTURE_2D, texID);
-
 		CheckGlError();
 
+		// Íàñòðîéêà ôèëüòðàöèè â çàâèñèìîñòè îò âûáðàííîãî òèïà
+		if (texData.mipmap == TextureDataStruct::GENERATE) {
+			// Èñïîëüçóåì òðèëèíåéíóþ ôèëüòðàöèþ äëÿ óñòðàíåíèÿ ìåðöàíèÿ
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+		}
+		else {
+			// Îáû÷íàÿ ëèíåéíàÿ ôèëüòðàöèÿ (áóäåò ìåðöàòü íà óäàëåíèè)
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		}
+
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		CheckGlError();
+
+		// Çàãðóçêà äàííûõ áàçîâîãî óðîâíÿ (Level 0)
+		GLint format = (texData.bitSize == TextureDataStruct::BS_24BIT) ? GL_RGB : GL_RGBA;
+
+		glTexImage2D(GL_TEXTURE_2D, 0, format,
+			static_cast<GLsizei>(width),
+			static_cast<GLsizei>(height),
+			0, format, GL_UNSIGNED_BYTE, texData.data.data());
 
 		CheckGlError();
 
-		//This should be only for Windows
-		//glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-
-		CheckGlError();
-
-		if (texData.bitSize == TextureDataStruct::BS_24BIT)
-		{
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, static_cast<GLsizei>(texData.width), static_cast<GLsizei>(texData.height), 0, GL_RGB, GL_UNSIGNED_BYTE, &texData.data[0]);
+		// Ãåíåðàöèÿ ìèï-ìàïîâ, åñëè ýòî íåîáõîäèìî
+		if (texData.mipmap == TextureDataStruct::GENERATE) {
+			glGenerateMipmap(GL_TEXTURE_2D);
+			CheckGlError();
 		}
-		else
-		{
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, static_cast<GLsizei>(texData.width), static_cast<GLsizei>(texData.height), 0, GL_RGBA, GL_UNSIGNED_BYTE, &texData.data[0]);
-		}
-
-		CheckGlError();
-
 	}
 
 	Texture::Texture(const std::array<TextureDataStruct, 6>& texDataArray)

src/render/TextureManager.h

@@ -10,19 +10,25 @@
 namespace ZL
 {
 
-	struct TextureDataStruct
-	{
+	struct TextureDataStruct {
 		size_t width;
 		size_t height;
 		std::vector<char> data;
+
 		enum BitSize {
 			BS_24BIT,
 			BS_32BIT
 		};
 
-		BitSize bitSize;
-	};
+		// Íîâîå ïåðå÷èñëåíèå äëÿ óïðàâëåíèÿ ìèï-ìàïïèíãîì
+		enum MipmapType {
+			NONE,       // Áåç ìèï-ìàïîâ (GL_LINEAR)
+			GENERATE    // Àâòîìàòè÷åñêàÿ ãåíåðàöèÿ (GL_LINEAR_MIPMAP_LINEAR)
+		};
 
+		BitSize bitSize;
+		MipmapType mipmap = GENERATE; // Ïî óìîë÷àíèþ âêëþ÷åíî
+	};
 	class Texture
 	{
 		size_t width = 0;