Merge branch 'master' of https://github.com/etlegacy/etlegacy

etlegacy · Sep 11, 2018 · 7fdab2a · 7fdab2a
2 parents 46796f5 + 831d93c
commit 7fdab2a
Show file tree

Hide file tree

Showing 16 changed files with 210 additions and 119 deletions.
diff --git a/cmake/ETLInstall.cmake b/cmake/ETLInstall.cmake
@@ -39,6 +39,11 @@ if(UNIX)
 		install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/linux/man/man6/"
 		DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6"
 	)
+
+	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/etl_renderer2.sh"
+		DESTINATION "${INSTALL_DEFAULT_MODDIR}"
+		PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+	)
 else(UNIX)
 	#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/etl.ico"
 	#	DESTINATION "${INSTALL_DEFAULT_MODDIR}"

diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
@@ -99,7 +99,7 @@ LangString DESC_Section1 ${LANG_ENGLISH} "ET: Legacy ${VERSION} has been install
 You will find your ETKEY, profile folder and all downloaded files in the $DOCUMENTS\ETLegacy directory."
 LangString DESC_Section2 ${LANG_ENGLISH} "Download Error: Couldn't fetch Installer file."
 LangString DESC_Section3 ${LANG_ENGLISH} "Integrity Error: Installer MD5 checksum failed."
-LangString DESC_Section4 ${LANG_ENGLISH} "During extraction of W:ET assets the screen will get black for a few seconds."
+LangString DESC_Section4 ${LANG_ENGLISH} "During extraction of W: ET assets the screen will get black for a few seconds."
 LangString DESC_Section5 ${LANG_ENGLISH} "Fatal Error: Installer extraction failed."
 LangString DESC_Section6 ${LANG_ENGLISH} "Fatal Error: Copy failed (pak0.pk3)."
 LangString DESC_Section7 ${LANG_ENGLISH} "Download Error: Couldn't fetch Patch file."
@@ -128,8 +128,8 @@ VIProductVersion "@FILE_VERSION@"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Enemy Territory Legacy Installer"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "ETL game installer"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Legacy Team"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "� 2012-2017 ET:Legacy Team"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "� 2012-2017 ET:Legacy Team"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "© 2012-2018 ET: Legacy Team"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2012-2018 ET: Legacy Team"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "ETL Installer"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "@FILE_VERSION@"
 
@@ -138,7 +138,7 @@ LangString DESC_Section1 ${LANG_POLISH} "ET: Legacy ${VERSION} zostalo zainstalo
 ETKEY, folder profilu i wszystkie sciagniete pliki znajdziesz w katalogu $DOCUMENTS\ETLegacy."
 LangString DESC_Section2 ${LANG_POLISH} "Blad Pobierania: Nie udalo sie sciagnac Instalatora."
 LangString DESC_Section3 ${LANG_POLISH} "Blad Integrarnosci: Zla suma kontrolna MD5 Instalatora."
-LangString DESC_Section4 ${LANG_POLISH} "Podczas wypakowywania plikow W:ET ekran stanie sie czarny na kilka sekund."
+LangString DESC_Section4 ${LANG_POLISH} "Podczas wypakowywania plikow W: ET ekran stanie sie czarny na kilka sekund."
 LangString DESC_Section5 ${LANG_POLISH} "Blad Krytyczny: Wypakowywanie Instalatora nie powiodlo sie."
 LangString DESC_Section6 ${LANG_POLISH} "Blad Krytyczny: Kopiowanie nie powiodlo sie (pak0.pk3)."
 LangString DESC_Section7 ${LANG_POLISH} "Blad Pobierania: Nie udalo sie sciagnac Latki."
@@ -164,11 +164,51 @@ LangString DESC_Section25 ${LANG_POLISH} "Zainstaluj GeoIP"
 VIAddVersionKey /LANG=${LANG_POLISH} "ProductName" "Instalator Enemy Territory Legacy"
 VIAddVersionKey /LANG=${LANG_POLISH} "Comments" "Instalator gry ETL"
 VIAddVersionKey /LANG=${LANG_POLISH} "CompanyName" "Legacy Team"
-VIAddVersionKey /LANG=${LANG_POLISH} "LegalTrademarks" "� 2012-2017 ET:Legacy Team"
-VIAddVersionKey /LANG=${LANG_POLISH} "LegalCopyright" "� 2012-2017 ET:Legacy Team"
+VIAddVersionKey /LANG=${LANG_POLISH} "LegalTrademarks" "© 2012-2018 ET: Legacy Team"
+VIAddVersionKey /LANG=${LANG_POLISH} "LegalCopyright" "© 2012-2018 ET: Legacy Team"
 VIAddVersionKey /LANG=${LANG_POLISH} "FileDescription" "Instalator ETL"
 VIAddVersionKey /LANG=${LANG_POLISH} "FileVersion" "@FILE_VERSION@"
 
+
+; German
+LangString DESC_Section1 ${LANG_GERMAN} "ET: Legacy ${VERSION} wurde auf deinem Computer installiert.$\n$\n\
+Du findest deinen ETKEY, Profil Pfad und alle heruntergeladenen Dateien im Ordner $DOCUMENTS\ETLegacy !"
+LangString DESC_Section2 ${LANG_GERMAN} "Download Fehler: Installer Datei nicht erreichbar."
+LangString DESC_Section3 ${LANG_GERMAN} "Integritäts Fehler: Installer MD5 Prüfung fehlgeschlagen."
+LangString DESC_Section4 ${LANG_GERMAN} "Während Extrahierung der W: ET Assets wird der Bildschirm für einige Sekunden schwarz."
+LangString DESC_Section5 ${LANG_GERMAN} "Fataler Fehler: Installer Extrahierung fehlgeschlagen."
+LangString DESC_Section6 ${LANG_GERMAN} "Fataler Fehler: Kopieren fehlgeschlagen (pak0.pk3)."
+LangString DESC_Section7 ${LANG_GERMAN} "Download Fehler: Patch Datei nicht erreichbar."
+LangString DESC_Section8 ${LANG_GERMAN} "Integritäts Fehler: Patch MD5 Prüfung fehlgeschlagen."
+LangString DESC_Section9 ${LANG_GERMAN} "Fataler Fehler: Patch Extrahierung fehlgeschlagen."
+LangString DESC_Section10 ${LANG_GERMAN} "Fataler Fehler: Kopieren fehlgeschlagen (pak1.pk3)."
+LangString DESC_Section11 ${LANG_GERMAN} "Fataler Fehler: Kopieren fehlgeschlagen (pak2.pk3)."
+LangString DESC_Section12 ${LANG_GERMAN} "Wichtig: Kopiere die ET Asset Dateien (pak0.pk3, pak1.pk3, pak2.pk3) nach $INSTDIR\etmain bevor du ET: Legacy startest."
+LangString DESC_Section13 ${LANG_GERMAN} "Download Fehler: Omni-bot Dateien nicht erreichbar."
+LangString DESC_Section14 ${LANG_GERMAN} "Fataler Fehler: Omni-bot Extrahierung fehlgeschlagen."
+LangString DESC_Section15 ${LANG_GERMAN} "ET Schlüssel Datei nicht gefunden. ET: Legacy wird diese beim Start erzeugen. Falls du eine Kopie von dem Schlüssel hast, kopiere diesen nach $DOCUMENTS\ETLegacy\etmain."
+LangString DESC_Section16 ${LANG_GERMAN} "Installiere Enemy Territory: Legacy Dateien."
+LangString DESC_Section17 ${LANG_GERMAN} "Wolfenstein: Enemy Territory .pk3 Assets abrufen. Die Dateien werden heruntergeladen wenn diese lokal nicht gefunden werden."
+LangString DESC_Section18 ${LANG_GERMAN} "Installiere Omni-bot Dateien für deinen Server oder für dein offline Training? Die letzte Version wird heruntergeladen."
+LangString DESC_Section19 ${LANG_GERMAN} "Deinstalliere Enemy Territory: Legacy and Omni-bot Dateien."
+LangString DESC_Section20 ${LANG_GERMAN} "Lösche Wolfenstein: Enemy Territory .pk3 Assets (pak0.pk3, pak1.pk3, pak2.pk3)."
+LangString DESC_Section21 ${LANG_GERMAN} "Lösche den ETKEY und alle erzeugten Dateienim Ordner $DOCUMENTS\ETLegacy ."
+LangString DESC_Section22 ${LANG_GERMAN} "ET: Legacy benötigt MS VC++ 2013 Redistributable Bibliothek, soll diese installiert werden?"
+LangString DESC_Section23 ${LANG_GERMAN} "Download Fehler: GeoIP Dateie nicht erreichbar."
+LangString DESC_Section24 ${LANG_GERMAN} "Fataler Fehler: GeoIP Extrahierung fehlgeschlagen."
+LangString DESC_Section25 ${LANG_GERMAN} "Installiere GeoIP Datei."
+LangString DESC_Section26 ${LANG_GERMAN} "Download Fehler: WolfAdmin Dateien nicht erreichbar."
+LangString DESC_Section27 ${LANG_GERMAN} "Fataler Fehler: WolfAdmin Extrahierung fehlgeschlagen."
+LangString DESC_Section28 ${LANG_GERMAN} "Installiere WolfAdmin Dateien."
+
+VIAddVersionKey /LANG=${LANG_GERMAN} "ProductName" "Enemy Territory Legacy Installer"
+VIAddVersionKey /LANG=${LANG_GERMAN} "Comments" "ETL game installer"
+VIAddVersionKey /LANG=${LANG_GERMAN} "CompanyName" "Legacy Team"
+VIAddVersionKey /LANG=${LANG_GERMAN} "LegalTrademarks" "© 2012-2018 ET: Legacy Team"
+VIAddVersionKey /LANG=${LANG_GERMAN} "LegalCopyright" "© 2012-2018 ET: Legacy Team"
+VIAddVersionKey /LANG=${LANG_GERMAN} "FileDescription" "ETL Installer"
+VIAddVersionKey /LANG=${LANG_GERMAN} "FileVersion" "@FILE_VERSION@"
+
 ; ------------------------
 ; INSTALL
 ; ------------------------
@@ -398,8 +438,9 @@ SectionEnd
 Section -Shortcuts
     SetOutPath $INSTDIR
     CreateDirectory "$SMPROGRAMS\Enemy Territory - Legacy"
-    CreateShortCut "$SMPROGRAMS\Enemy Territory - Legacy\Enemy Territory - Legacy Homepage.lnk" "http://www.etlegacy.com" "" "$INSTDIR\etl.ico"
-    CreateShortCut "$SMPROGRAMS\Enemy Territory - Legacy\Launch Enemy Territory - Legacy.lnk" "$INSTDIR\etl.exe"
+    CreateShortCut "$SMPROGRAMS\Enemy Territory - Legacy\Visit ET: Legacy Homepage.lnk" "http://www.etlegacy.com" "" "$INSTDIR\etl.ico"
+    CreateShortCut "$SMPROGRAMS\Enemy Territory - Legacy\Launch ET: Legacy - Legacy.lnk" "$INSTDIR\etl.exe" "+set cl_renderer opengl1 +set com_hunkmegs 128"
+    CreateShortCut "$SMPROGRAMS\Enemy Territory - Legacy\Launch ET: Legacy Renderer2 - Legacy.lnk" "$INSTDIR\etl.exe" "+set cl_renderer opengl2 +set com_hunkmegs 512"
     CreateShortCut "$SMPROGRAMS\Enemy Territory - Legacy\Play on Official Server.lnk" "et://etlegacy.com:27960" "" "$INSTDIR\etl.ico"
     CreateShortCut "$SMPROGRAMS\Enemy Territory - Legacy\Uninstall.lnk" "$INSTDIR\uninstall.exe"
     CreateShortCut "$DESKTOP\Enemy Territory - Legacy.lnk" "$INSTDIR\etl.exe"

diff --git a/etmain/ui/credits_additional.menu b/etmain/ui/credits_additional.menu
@@ -179,7 +179,7 @@ menuDef {
 
 	LABELWHITE( 6, CREDITS_Y+52, .5*(WINDOW_WIDTH-24), 10, "Tony Ray", .2, ITEM_ALIGN_RIGHT, .5*(WINDOW_WIDTH-24), 8 )
 	LABELWHITE( 6+.5*(WINDOW_WIDTH-24)+12, CREDITS_Y+52, .5*(WINDOW_WIDTH-24), 10, _("President"), .2, ITEM_ALIGN_LEFT, 0, 8 )
-	LABELWHITE( 6, CREDITS_Y+64, .5*(WINDOW_WIDTH-24), 10, "Bj�rn Christoph", .2, ITEM_ALIGN_RIGHT, .5*(WINDOW_WIDTH-24), 8 )
+	LABELWHITE( 6, CREDITS_Y+64, .5*(WINDOW_WIDTH-24), 10, "Björn Christoph", .2, ITEM_ALIGN_RIGHT, .5*(WINDOW_WIDTH-24), 8 )
 	LABELWHITE( 6+.5*(WINDOW_WIDTH-24)+12, CREDITS_Y+64, .5*(WINDOW_WIDTH-24), 10, _("Senior Project Leader"), .2, ITEM_ALIGN_LEFT, 0, 8 )
 
 // Voice Artists //

diff --git a/etmain/ui/menumacros.h b/etmain/ui/menumacros.h
@@ -38,7 +38,7 @@
 
 #define LEGACY_RESOLUTIONS cvarFloatList { "desktop resolution" - 2 "custom resolution" - 1 "640*480" 3 "800*600" 4 "960*720" 5 "1024*768" 6 "1152*864" 7 "1280*1024" 8 "1600*1200" 9 "2048*1536" 10 "856*480 Wide Screen" 11 "1366x768 (16:9)" 12 "1440x900 (16:10)" 13 "1680x1050 (16:10)" 14 "1600x1200" 15 "1920x1080 (16:9)" 16 "1920x1200 (16:10)" 17 "2560x1440 (16:9)" 18 "2560x1600 (16:10)" 19 "3840x2160 (16:9)" 20 }
 #define LEGACY_WINDOWMODES cvarFloatList { "Windowed" 0 "Fullscreen" 1 "Windowed Fullscreen" 2 }
-#define LEGACY_LANGUAGES   cvarStrList { "English (default)  "; "en"; "French"; "fr"; "German"; "de"; "Polish"; "pl"; "Russian"; "ru"; "Dutch"; "nl"; "Czech"; "cs"; "Finnish"; "fi"; "Norwegian"; "no"; "Spanish"; "es"; "Italian"; "it" }
+#define LEGACY_LANGUAGES   cvarStrList { "English (default)  "; "en"; "Czech"; "cs"; "Dutch"; "nl"; "Finnish"; "fi"; "French"; "fr"; "German"; "de"; "Greek"; "el"; "Hungarian"; "hu"; "Italian"; "it"; "Norwegian"; "no"; "Polish"; "pl"; "Portuguese"; "pt";  "Russian"; "ru";  "Spanish"; "es"; "Turkish"; "tr"; }
 #define LEGACY_RENDERERS   cvarStrList { "Vanilla (default)  "; "opengl1"; "ET: Legacy"; "opengl2" }
 
 // Marks text as translatable

diff --git a/misc/etl_renderer2.sh b/misc/etl_renderer2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Simple script to start ET Legacy client with experimental new renderer
+#
+#./etl +set cl_renderer opengl1 +set com_hunkmegs 128 
+./etl +set cl_renderer opengl2 +set com_hunkmegs 512  
diff --git a/src/game/g_script.c b/src/game/g_script.c
@@ -349,6 +349,7 @@ void G_Script_ScriptParse(gentity_t *ent)
 	char                    *pScript;
 	char                    *token;
 	qboolean                wantName;
+	qboolean                wantScript;
 	qboolean                inScript;
 	int                     eventNum;
 	g_script_event_t        events[G_MAX_SCRIPT_STACK_ITEMS];
@@ -372,9 +373,10 @@ void G_Script_ScriptParse(gentity_t *ent)
 
 	buildScript = (qboolean)(trap_Cvar_VariableIntegerValue("com_buildScript"));
 
-	pScript  = level.scriptEntity;
-	wantName = qtrue;
-	inScript = qfalse;
+	pScript    = level.scriptEntity;
+	wantName   = qtrue;
+	wantScript = qfalse;
+	inScript   = qfalse;
 	COM_BeginParseSession("G_Script_ScriptParse");
 	bracketLevel  = 0;
 	numEventItems = 0;
@@ -413,6 +415,7 @@ void G_Script_ScriptParse(gentity_t *ent)
 			{
 				G_Error("G_Script_ScriptParse(), Error (line %d): '{' found, NAME expected.\n", COM_GetCurrentParseLine());
 			}
+			wantScript = qfalse;
 		}
 		else if (wantName)
 		{
@@ -426,7 +429,8 @@ void G_Script_ScriptParse(gentity_t *ent)
 				inScript      = qtrue;
 				numEventItems = 0;
 			}
-			wantName = qfalse;
+			wantName   = qfalse;
+			wantScript = qtrue;
 		}
 		else if (inScript)
 		{
@@ -588,6 +592,11 @@ void G_Script_ScriptParse(gentity_t *ent)
 		}
 		else     // skip this character completely
 		{
+			if (wantScript)
+			{
+				G_Error("G_Script_ScriptParse(), Error (line %d): '{' expected, but found '%s'.\n", COM_GetCurrentParseLine(), token);
+			}
+
 			while ((token = COM_Parse(&pScript)) != NULL)
 			{
 				if (!token[0])
@@ -912,6 +921,20 @@ void script_linkentity(gentity_t *ent)
 	trap_LinkEntity(ent);
 }
 
+/**
+ * Script mover flags
+ */
+
+#define SMF_TRIGGERSPAWN        1
+#define SMF_SOLID               2
+#define SMF_EXPLOSIVEDAMAGEONLY 4
+#define SMF_RESURRECTABLE       8
+#define SMF_COMPASS             16
+#define SMF_ALLIES              32
+#define SMF_AXIS                64
+#define SMF_MOUNTED_GUN         128
+#define SMF_DENSITY             256
+
 /**
  * @brief script_mover_die
  * @param[in,out] self
@@ -924,7 +947,7 @@ void script_mover_die(gentity_t *self, gentity_t *inflictor, gentity_t *attacker
 {
 	G_Script_ScriptEvent(self, "death", "");
 
-	if (!(self->spawnflags & 8))
+	if (!(self->spawnflags & SMF_RESURRECTABLE))
 	{
 		G_FreeEntity(self);
 	}
@@ -943,7 +966,7 @@ void script_mover_die(gentity_t *self, gentity_t *inflictor, gentity_t *attacker
  */
 void script_mover_think(gentity_t *ent)
 {
-	if (ent->spawnflags & 128)
+	if (ent->spawnflags & SMF_MOUNTED_GUN)
 	{
 		if (!ent->tankLink)
 		{
@@ -976,7 +999,7 @@ void script_mover_think(gentity_t *ent)
  */
 void script_mover_spawn(gentity_t *ent)
 {
-	if (ent->spawnflags & 128)
+	if (ent->spawnflags & SMF_MOUNTED_GUN)
 	{
 		if (ent->tagBuffer[0] == '\0')
 		{
@@ -1001,7 +1024,7 @@ void script_mover_spawn(gentity_t *ent)
 		ent->s.effect3Time = ent->nextTrain - g_entities;
 	}
 
-	if (ent->spawnflags & 2)
+	if (ent->spawnflags & SMF_SOLID)
 	{
 		ent->clipmask   = CONTENTS_SOLID;
 		ent->r.contents = CONTENTS_SOLID;
@@ -1026,7 +1049,7 @@ void script_mover_spawn(gentity_t *ent)
  */
 void script_mover_use(gentity_t *ent, gentity_t *other, gentity_t *activator)
 {
-	if (ent->spawnflags & 8)
+	if (ent->spawnflags & SMF_RESURRECTABLE)
 	{
 		if (ent->count)
 		{
@@ -1076,20 +1099,6 @@ void script_mover_blocked(gentity_t *ent, gentity_t *other)
 	G_Damage(other, ent, ent, NULL, NULL, GIB_DAMAGE(other->health), 0, MOD_CRUSH);
 }
 
-/**
- * Script mover flags
- */
-
-#define SMF_TRIGGERSPAWN        1
-#define SMF_SOLID               2
-#define SMF_EXPLOSIVEDAMAGEONLY 4
-#define SMF_RESURRECTABLE       8
-#define SMF_COMPASS             16
-#define SMF_ALLIES              32
-#define SMF_AXIS                64
-#define SMF_MOUNTED_GUN         128
-#define SMF_DENSITY             256
-
 /**
  * @brief Scripted brush entity. A simplified means of moving brushes around based on events.
  *
@@ -1261,13 +1270,19 @@ void SP_script_mover(gentity_t *ent)
 
 //..............................................................................
 
+/**
+ * Script model med spawn flags
+ */
+#define SMMSF_TRIGGERSPAWN 1
+#define SMMSF_SOLID        2
+
 /**
  * @brief script_model_med_spawn
  * @param[in,out] ent
  */
 void script_model_med_spawn(gentity_t *ent)
 {
-	if (ent->spawnflags & 2)
+	if (ent->spawnflags & SMMSF_SOLID)
 	{
 		ent->clipmask   = CONTENTS_SOLID;
 		ent->r.contents = CONTENTS_SOLID;
@@ -1324,7 +1339,7 @@ void SP_script_model_med(gentity_t *ent)
 	VectorCopy(ent->s.angles, ent->s.apos.trBase);
 	VectorClear(ent->s.apos.trDelta);
 
-	if (ent->spawnflags & 1)
+	if (ent->spawnflags & SMMSF_TRIGGERSPAWN)
 	{
 		ent->use = script_model_med_use;
 		trap_UnlinkEntity(ent);   // make sure it's not visible

diff --git a/src/qcommon/common.c b/src/qcommon/common.c
@@ -66,7 +66,7 @@ int demo_protocols[] =
 #define MIN_DEDICATED_COMHUNKMEGS   1
 #define MIN_COMHUNKMEGS             64
 
-#define DEF_COMHUNKMEGS             256
+#define DEF_COMHUNKMEGS             128 // renderer2 requires 512
 
 #ifdef DEDICATED
 #define DEF_COMZONEMEGS             24

diff --git a/src/renderer2/gldef/default.gldef b/src/renderer2/gldef/default.gldef
@@ -185,7 +185,7 @@ debugShadowMap
 liquid
 {
 	filename "liquid"
-	macros USE_PARALLAX_MAPPING
+	macros USE_PORTAL_CLIPPING USE_NORMAL_MAPPING USE_PARALLAX_MAPPING
 	attribs ATTR_POSITION ATTR_TEXCOORD ATTR_TANGENT ATTR_BINORMAL ATTR_NORMAL ATTR_COLOR
 }
 

diff --git a/src/renderer2/glsl/forwardLighting_fp.glsl b/src/renderer2/glsl/forwardLighting_fp.glsl
@@ -958,15 +958,12 @@ void    main()
 	vec3 V = normalize(u_ViewOrigin - var_Position.xyz);
 
 #if defined(USE_PARALLAX_MAPPING)
-
 	// ray intersect in view direction
 
-	mat3 worldToTangentMatrix;
-	worldToTangentMatrix = transpose(tangentToWorldMatrix);
+	mat3 worldToTangentMatrix = transpose(tangentToWorldMatrix);
 
 	// compute view direction in tangent space
-	vec3 Vts = worldToTangentMatrix * V;
-	Vts = normalize(Vts);
+	vec3 Vts = normalize(worldToTangentMatrix * V);
 
 	// size and start position of search in texture space
 	vec2 S = Vts.xy * -u_DepthScale / Vts.z;
@@ -986,10 +983,12 @@ void    main()
 
 	// compute normal in tangent space from normalmap
 	vec3 N = 2.0 * (texture2D(u_NormalMap, texNormal.st).xyz - 0.5);
-	#if defined(r_NormalScale)
+
+#if defined(r_NormalScale)
 	N.z *= r_NormalScale;
-	normalize(N);
-	#endif
+#endif
+
+	N = normalize(N);
 
 	// transform normal into world space
 	N = normalize(tangentToWorldMatrix * N);