Rendering Bugfixes

 * Re-enabled lighting & normals that were disabled due to merge
 * Re-added smooth outline rendering as fallback
 * Fixed OpenGL reference in CMake files

platforms/sdl/CMakeLists.txt

@@ -70,7 +70,7 @@ if(USE_GLES1_COMPATIBILITY_LAYER)
     endif()
 else()
     find_package(OpenGL REQUIRED)
-    target_link_libraries(reminecraftpe-core PUBLIC OpenGL::OpenGL)
+    target_link_libraries(reminecraftpe-core PUBLIC OpenGL::GL)
 endif()
 
 # WASM

source/client/app/NinecraftApp.cpp

@@ -65,7 +65,7 @@ void NinecraftApp::initGLStates()
 	glCullFace(GL_BACK);
 	glEnable(GL_TEXTURE_2D);
 	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-	//glDisable(GL_LIGHTING);
+	glDisable(GL_LIGHTING);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 

source/client/gui/components/RolledSelectionList.cpp

@@ -163,7 +163,7 @@ void RolledSelectionList::render(int mouseX, int mouseY, float f)
 
 	capXPosition();
 
-	//glDisable(GL_LIGHTING);
+	glDisable(GL_LIGHTING);
 	glDisable(GL_FOG);
 
 	m_pMinecraft->m_pTextures->loadAndBindTexture("gui/background.png");

source/client/gui/components/ScrolledSelectionList.cpp

@@ -161,7 +161,7 @@ void ScrolledSelectionList::render(int mouseX, int mouseY, float f)
 	field_38 *= 0.75f;
 	capYPosition();
 
-	//glDisable(GL_LIGHTING);
+	glDisable(GL_LIGHTING);
 	glDisable(GL_FOG);
 
 	m_pMinecraft->m_pTextures->loadAndBindTexture("gui/background.png");

source/client/renderer/GameRenderer.cpp

@@ -331,7 +331,7 @@ void GameRenderer::setupFog(int i)
 	fog_color[3] = 1.0f;
 
 	glFogfv(GL_FOG_COLOR, fog_color);
-	//glNormal3f(0.0f, -1.0f, 0.0f);
+	glNormal3f(0.0f, -1.0f, 0.0f);
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 
 	if (m_pMinecraft->m_pMobPersp->isUnderLiquid(Material::water))

source/client/renderer/ItemInHandRenderer.cpp

@@ -199,7 +199,7 @@ void ItemInHandRenderer::render(float f)
 		glTranslatef(-0.3f * Mth::sin(float(M_PI) * Mth::sqrt(fAnim)), 0.4f * Mth::sin(2.0f * float(M_PI) * Mth::sqrt(fAnim)), -0.4f * Mth::sin(float(M_PI) * fAnim));
 		glTranslatef(0.64f, ((1.0f - h) * -0.6f) - 0.6f, -0.72f);
 		glRotatef(45.0f, 0.0f, 1.0f, 0.0f);
-		//glEnable(GL_RESCALE_NORMAL);
+		glEnable(GL_RESCALE_NORMAL);
 
 		// @HUH: refetch
 		fAnim = pLP->getAttackAnim(f);
@@ -229,7 +229,7 @@ void ItemInHandRenderer::render(float f)
 		glTranslatef(-0.4f * Mth::sin(float(M_PI) * Mth::sqrt(fAnim)), 0.2f * Mth::sin(2.0f * float(M_PI) * Mth::sqrt(fAnim)), -0.2f * Mth::sin(float(M_PI) * fAnim));
 		glTranslatef(0.56f, ((1.0f - h) * -0.6f) - 0.52f, -0.72f);
 		glRotatef(45.0f, 0.0f, 1.0f, 0.0f);
-		//glEnable(GL_RESCALE_NORMAL);
+		glEnable(GL_RESCALE_NORMAL);
 
 		// @HUH: refetch
 		fAnim = pLP->getAttackAnim(f);

source/client/renderer/LevelRenderer.cpp

@@ -548,7 +548,7 @@ void LevelRenderer::render(Mob* pMob, int a, float b)
 				c = m_chunksLength;
 
 			glDisable(GL_TEXTURE_2D);
-			//glDisable(GL_LIGHTING);
+			glDisable(GL_LIGHTING);
 			glDisable(GL_ALPHA_TEST);
 			glDisable(GL_FOG);
 			glColorMask(false, false, false, false);
@@ -907,7 +907,12 @@ void LevelRenderer::renderHitOutline(Player* pPlayer, const HitResult& hr, int i
 	float line_width = 1.5f / Gui::InvGuiScale;
 	// Clamp Line Width
 	float range[2];
+#ifdef GL_ALIASED_LINE_WIDTH_RANGE
 	glGetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, range);
+#else
+	glEnable(GL_LINE_SMOOTH);
+	glGetFloatv(GL_SMOOTH_LINE_WIDTH_RANGE, range);
+#endif
 	if (range[1] < line_width)
 	{
 		line_width = range[1];
@@ -938,6 +943,9 @@ void LevelRenderer::renderHitOutline(Player* pPlayer, const HitResult& hr, int i
 		render(aabb);
 	}
 
+#ifndef GL_ALIASED_LINE_WIDTH_RANGE
+	glDisable(GL_LINE_SMOOTH);
+#endif
 	glDepthMask(true);
 	glEnable(GL_TEXTURE_2D);
 	glDisable(GL_BLEND);

source/client/renderer/entity/ItemRenderer.cpp

@@ -52,7 +52,7 @@ void ItemRenderer::render(Entity* pEntity, float x, float y, float z, float a, f
 		itemsToRender = 4;
 
 	glTranslatef(x, y + 0.1f + yOffset * 0.1f, z);
-	//glEnable(GL_RESCALE_NORMAL);
+	glEnable(GL_RESCALE_NORMAL);
 
 	int itemID = pItemInstance->m_itemID;
 	if (itemID < C_MAX_TILES && TileRenderer::canRender(Tile::tiles[itemID]->getRenderShape()))
@@ -123,7 +123,7 @@ void ItemRenderer::render(Entity* pEntity, float x, float y, float z, float a, f
 		}
 	}
 
-	//glDisable(GL_RESCALE_NORMAL);
+	glDisable(GL_RESCALE_NORMAL);
 	glPopMatrix();
 }
 

source/client/renderer/entity/ItemSpriteRenderer.cpp

@@ -10,7 +10,7 @@ void ItemSpriteRenderer::render(Entity* pEntity, float x, float y, float z, floa
 {
 	glPushMatrix();
 	glTranslatef(x, y, z);
-	//glEnable(GL_RESCALE_NORMAL);
+	glEnable(GL_RESCALE_NORMAL);
 	glScalef(0.5f, 0.5f, 0.5f);
 	bindTexture(C_ITEMS_NAME);
 
@@ -32,6 +32,6 @@ void ItemSpriteRenderer::render(Entity* pEntity, float x, float y, float z, floa
 	t.vertexUV(-0.5f, +0.75f, 0.0f, float(16 * (m_sprite % 16))     / 256.0f, float(16 * (m_sprite / 16))     / 256.0f);
 	t.draw();
 
-	//glDisable(GL_RESCALE_NORMAL);
+	glDisable(GL_RESCALE_NORMAL);
 	glPopMatrix();
 }

source/client/renderer/entity/MobRenderer.cpp

@@ -213,7 +213,7 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& str, float x, float
 
 	glPushMatrix();
 	glTranslatef(x + 0.0f, y + 2.3f, z);
-	//glNormal3f(0.0f, 1.0f, 0.0f);
+	glNormal3f(0.0f, 1.0f, 0.0f);
 	// billboard the name towards the camera
 	glRotatef(-m_pDispatcher->m_rot.x,   0.0f, 1.0f, 0.0f);
 	glRotatef(+m_pDispatcher->m_rot.y, 1.0f, 0.0f, 0.0f);