Effect: Fix ubershader.

BobDotCom · Jan 8, 2022 · 7c8914c · 7c8914c
1 parent 352b639
commit 7c8914c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/Models/Effects/fuselage/model-combined-fuselage.eff b/Models/Effects/fuselage/model-combined-fuselage.eff
@@ -1521,10 +1521,10 @@ Modifications author: Nikolai V. Chr.
 			</vertex-program-two-side>
 
 	  <program n="0">
-		<vertex-shader n="0">Aircraft/f16/Shaders/ubershader.vert</vertex-shader>
-		<fragment-shader n="0">Aircraft/f16/Shaders/ubershader-gbuffer.frag</fragment-shader>
-		<fragment-shader n="1">Aircraft/f16/Shaders/gbuffer-functions.frag</fragment-shader>
-		<fragment-shader n="2">Aircraft/f16/Shaders/gbuffer-encode.frag</fragment-shader>
+		<vertex-shader n="0">Aircraft/f16/Shaders4/ubershader.vert</vertex-shader>
+		<fragment-shader n="0">Aircraft/f16/Shaders4/ubershader-gbuffer.frag</fragment-shader>
+		<fragment-shader n="1">Aircraft/f16/Shaders4/gbuffer-functions.frag</fragment-shader>
+		<fragment-shader n="2">Aircraft/f16/Shaders4/gbuffer-encode.frag</fragment-shader>
 	  </program>
 
 			<uniform>

diff --git a/Models/Effects/fuselage/model-combined-turbine.eff b/Models/Effects/fuselage/model-combined-turbine.eff
@@ -1516,10 +1516,10 @@ Modifications author: Nikolai V. Chr.
 			</vertex-program-two-side>
 
 	  <program n="0">
-		<vertex-shader n="0">Aircraft/f16/Shaders/ubershader.vert</vertex-shader>
-		<fragment-shader n="0">Aircraft/f16/Shaders/ubershader-gbuffer.frag</fragment-shader>
-		<fragment-shader n="1">Aircraft/f16/Shaders/gbuffer-functions.frag</fragment-shader>
-		<fragment-shader n="2">Aircraft/f16/Shaders/gbuffer-encode.frag</fragment-shader>
+		<vertex-shader n="0">Aircraft/f16/Shaders4/ubershader.vert</vertex-shader>
+		<fragment-shader n="0">Aircraft/f16/Shaders4/ubershader-gbuffer.frag</fragment-shader>
+		<fragment-shader n="1">Aircraft/f16/Shaders4/gbuffer-functions.frag</fragment-shader>
+		<fragment-shader n="2">Aircraft/f16/Shaders4/gbuffer-encode.frag</fragment-shader>
 	  </program>
 
 			<uniform>

diff --git a/Models/pilot_externalview.xml b/Models/pilot_externalview.xml
@@ -15,7 +15,7 @@
         <texture>Liveries/patch.default.png</texture>
     </animation>
 
-    <!--effect>
+    <effect>
       <inherits-from>Effects/model-combined-transparent</inherits-from>
       <parameters>
 			<rain-enabled type="int">0</rain-enabled>
@@ -49,9 +49,9 @@
 			</render-bin>
       </parameters>
       <object-name>L-visor</object-name>
- </effect-->
+ </effect>
 
- 	<!--effect>
+ 	<effect>
       	<inherits-from>Effects/model-combined-deferred</inherits-from>
       	<parameters>
 			<rain-enabled type="int">0</rain-enabled>
@@ -101,7 +101,7 @@
 		<object-name>bag</object-name>
 		<object-name>life-jacket</object-name>
 		<object-name>disk</object-name>
-		<object-name>L-face-mask</object-name-->
+		<object-name>L-face-mask</object-name>
 		<!--object-name>pilot</object-name-->        
 		<!--object-name>LL-arm</object-name-->
 		<!--object-name>LL-glove</object-name-->
@@ -111,6 +111,6 @@
 		<!--object-name>LR-hand</object-name-->
 		<!--object-name>LR-glove</object-name-->		
 		<!--object-name>LR-leg</object-name-->
-    <!--/effect-->
+    </effect>
 
 </PropertyList>
diff --git a/Shaders/gbuffer-encode.frag → Shaders4/gbuffer-encode.frag b/Shaders/gbuffer-encode.frag → Shaders4/gbuffer-encode.frag
diff --git a/Shaders/gbuffer-functions.frag → Shaders4/gbuffer-functions.frag b/Shaders/gbuffer-functions.frag → Shaders4/gbuffer-functions.frag
diff --git a/Shaders/ubershader-gbuffer.frag → Shaders4/ubershader-gbuffer.frag b/Shaders/ubershader-gbuffer.frag → Shaders4/ubershader-gbuffer.frag
diff --git a/Shaders/ubershader.vert → Shaders4/ubershader.vert b/Shaders/ubershader.vert → Shaders4/ubershader.vert