Use the shader registry

Author: drewc5131

resources/shaders/tt_sha_dna_anim_prop.frag

@@ -0,0 +1,18 @@
+// Hardware Skinning DNA ANIMPROP Fragment Shader
+// Drewcification 122120
+
+#version 430
+
+uniform vec4 p3d_ColorScale;
+
+in vec4 vColor;
+in vec2 texcoord;
+
+out vec4 color;
+
+uniform sampler2D p3d_Texture0;
+
+void main() {
+	// Mix the Texture, ColorScale, and VertexColor to get the full color
+	color = p3d_ColorScale * texture(p3d_Texture0, texcoord) * vColor;
+}

resources/shaders/tt_sha_dna_anim_prop.vert

@@ -0,0 +1,31 @@
+// Hardware Skinning DNA ANIMPROP Vertex Shader
+// Drewcification 122120
+
+#version 430
+in vec4 p3d_Vertex;
+in vec4 p3d_Color;
+in vec2 p3d_MultiTexCoord0;
+
+in vec4 transform_weight;
+in uvec4 transform_index;
+
+uniform mat4 p3d_ModelViewProjectionMatrix;
+
+uniform mat4 p3d_TransformTable[100];
+
+out vec4 vColor;
+out vec2 texcoord;
+
+void main() {
+	// calculates the positions of the vertices for the animation
+
+	mat4 animMatrix = p3d_TransformTable[transform_index.x] * transform_weight.x
+				+ p3d_TransformTable[transform_index.y] * transform_weight.y
+				+ p3d_TransformTable[transform_index.z] * transform_weight.z
+				+ p3d_TransformTable[transform_index.w] * transform_weight.w;
+
+	gl_Position = p3d_ModelViewProjectionMatrix * animMatrix * p3d_Vertex;
+
+	vColor = p3d_Color;
+	texcoord = p3d_MultiTexCoord0;
+}

toontown/hood/GenericAnimatedProp.py

@@ -2,6 +2,9 @@
 from direct.actor import Actor
 from direct.interval.IntervalGlobal import *
 from direct.directnotify import DirectNotifyGlobal
+
+from ott.ShaderRegistry import ShaderRegistry
+
 from toontown.toonbase import ToontownGlobals
 from toontown.hood import ZoneUtil
 from toontown.hood import HoodUtil
@@ -85,7 +88,10 @@ def setupActor(self, node):
         self.trashcan.loadAnims({'anim': f"{self.path}/{anim}"})
         self.trashcan.pose('anim', 0)
         self.trashcan.setBlend(frameBlend = 1)
-        self.trashcan.setShaderAuto()
+        shader = ShaderRegistry.get('dna:anim_prop')
+        attr = ShaderAttrib.make(shader)
+        attr = attr.setFlag(ShaderAttrib.F_hardware_skinning, True)
+        self.trashcan.setAttrib(attr)
         self.node = self.trashcan
 
     def calcHoodId(self, node):

toontown/leveleditor/LevelEditorPanel.py

@@ -13,6 +13,8 @@
 from .LevelEditorGlobals import *
 from .LESceneGraphExplorer import *
 
+from ott.ShaderRegistry import ShaderRegistry
+
 from toontown.fixes import VectorWidgets
 
 
@@ -1578,10 +1580,7 @@ def runInject(self, e):
 
     def toggleOT(self):
         if self.toggleOTVar.get():
-            self.levelEditor.getNPToplevel().setShader(
-                    Shader.load(Shader.SL_GLSL,
-                                vertex = 'resources/shaders/tt_sha_render_bandw.vert',
-                                fragment = 'resources/shaders/tt_sha_render_bandw.frag'))
+            self.levelEditor.getNPToplevel().setShader(ShaderRegistry.get('render:black_and_white'))
         else:
             self.levelEditor.getNPToplevel().clearShader()
 

ttle.py

@@ -13,6 +13,8 @@
 from tkinter import Tk, messagebox
 
 from ott.Settings import Settings
+from ott.ShaderRegistry import ShaderRegistry
+
 from toontown.toonbase import ToontownGlobals
 
 TOONTOWN_ONLINE = 0
@@ -128,6 +130,8 @@ def __init__(self):
             loop.run_until_complete(self.__checkUpdates())
 
         self.__addCullBins()
+        
+        self.__registerShaders()
 
         # Now we actually start the editor
         ShowBase.__init__(self)
@@ -218,6 +222,15 @@ def __addCullBins():
         cbm = CullBinManager.getGlobalPtr()
         cbm.addBin('ground', CullBinManager.BTUnsorted, 18)
         cbm.addBin('shadow', CullBinManager.BTBackToFront, 19)
+        
+    @staticmethod
+    def __registerShaders():
+        ShaderRegistry.register('render:black_and_white',
+                                frag = 'resources/shaders/tt_sha_render_bandw.frag',
+                                vert = 'resources/shaders/tt_sha_render_bandw.vert')
+        ShaderRegistry.register('dna:anim_prop',
+                                frag = 'resources/shaders/tt_sha_dna_anim_prop.frag',
+                                vert = 'resources/shaders/tt_sha_dna_anim_prop.vert')
 
     async def __checkUpdates(self):
         import aiohttp, webbrowser