fix #74; temporarily fix #73

Arkueid · Arkueid · commit 25cd8fa7d673 · 2025-03-30T10:10:02.000+08:00
diff --git a/Resources/.gitignore b/Resources/.gitignore
@@ -1,3 +1,5 @@
 v3/magic
 v3/liveroid
-v3/whitecat
+v3/whitecat
+v3/小九
+v3/金发大小姐
diff --git a/package/live2d/v2/core/deformer/warp_deformer.py b/package/live2d/v2/core/deformer/warp_deformer.py
@@ -7,7 +7,7 @@
 
 
 class WarpDeformer(Deformer):
-    gT_ = [False]
+    paramOutSide = [False]
 
     def __init__(self):
         super().__init__()
@@ -47,7 +47,7 @@ def setupInterpolate(self, modelContext, deformerContext: 'WarpContext'):
             return
 
         aL = self.VT_()
-        aH = WarpDeformer.gT_
+        aH = WarpDeformer.paramOutSide
         aH[0] = False
         UtInterpolate.interpolatePoints(modelContext, self.pivotMgr, aH, aL, self.pivotPoints, aK.interpolatedPoints, 0,
                                         2)
diff --git a/package/live2d/v2/core/graphics/draw_param_opengl.py b/package/live2d/v2/core/graphics/draw_param_opengl.py
@@ -243,20 +243,20 @@ def loadShaders2(self):
         if not self.shaderProgramOff:
             return False
 
-        aK = ("#version 330 core\n"
-              "layout(location = 0) in vec2 a_position;"
-              "layout(location = 1) in vec2 a_texCoord;"
-              "out vec2 v_texCoord;"
-              "out vec4 v_clipPos;"
+        aK = ("#version 120\n"
+              "attribute vec2 a_position;"
+              "attribute vec2 a_texCoord;"
+              "varying vec2 v_texCoord;"
+              "varying vec4 v_clipPos;"
               "uniform mat4 u_mvpMatrix;"
               "void main(){"
               "    gl_Position = u_mvpMatrix * vec4(a_position, 0.0, 1.0);"
               "    v_clipPos = gl_Position;"
               "    v_texCoord = a_texCoord;"
               "    v_texCoord.y = 1.0 - v_texCoord.y;}")
-        aM = ("#version 330 core\n"
-              "in vec2       v_texCoord;"
-              "in vec4       v_clipPos;"
+        aM = ("#version 120\n"
+              "varying vec2       v_texCoord;"
+              "varying vec4       v_clipPos;"
               "uniform sampler2D  s_texture0;"
               "uniform vec4       u_channelFlag;"
               "uniform vec4       u_baseColor;"
@@ -271,20 +271,20 @@ def loadShaders2(self):
               "          * step(u_baseColor.y, v_clipPos.y/v_clipPos.w)"
               "          * step(v_clipPos.x/v_clipPos.w, u_baseColor.z)"
               "          * step(v_clipPos.y/v_clipPos.w, u_baseColor.w);"
-              "        smpColor = u_channelFlag * texture(s_texture0, v_texCoord).a * isInside;"
+              "        smpColor = u_channelFlag * texture2D(s_texture0, v_texCoord).a * isInside;"
               "    }else{"
-              "        smpColor = texture(s_texture0 , v_texCoord);"
+              "        smpColor = texture2D(s_texture0 , v_texCoord);"
               "        smpColor.rgb = smpColor.rgb * u_multiplyColor.rgb;"
               "        smpColor.rgb = smpColor.rgb + u_screenColor.rgb - (smpColor.rgb * u_screenColor.rgb);"
               "        smpColor = smpColor * u_baseColor;"
               "        smpColor = vec4(smpColor.rgb * smpColor.a, smpColor.a);"
               "    }"
               "    gl_FragColor = smpColor;}")
-        aL = ("#version 330 core\n"
-              "layout(location = 0) in vec2     a_position;"
-              "layout(location = 1) in vec2     a_texCoord;"
-              "out vec2       v_texCoord;"
-              "out vec4       v_clipPos;"
+        aL = ("#version 120\n"
+              "attribute vec2     a_position;"
+              "attribute vec2     a_texCoord;"
+              "varying vec2       v_texCoord;"
+              "varying vec4       v_clipPos;"
               "uniform mat4       u_mvpMatrix;"
               "uniform mat4       u_clipMatrix;"
               "void main(){"
@@ -293,22 +293,22 @@ def loadShaders2(self):
               "    v_clipPos = u_clipMatrix * pos;"
               "    v_texCoord = a_texCoord;"
               "    v_texCoord.y = 1.0 - v_texCoord.y;}")
-        aJ = ("#version 330 core\n"
-              "in vec2       v_texCoord;"
-              "in vec4       v_clipPos;"
+        aJ = ("#version 120\n"
+              "varying   vec2   v_texCoord;"
+              "varying   vec4   v_clipPos;"
               "uniform sampler2D  s_texture0;"
               "uniform sampler2D  s_texture1;"
               "uniform vec4       u_channelFlag;"
               "uniform vec4       u_baseColor;"
               "uniform vec4       u_screenColor;"
               "uniform vec4       u_multiplyColor;"
               "void main(){"
-              "    vec4 col_formask = texture(s_texture0, v_texCoord);"
+              "    vec4 col_formask = texture2D(s_texture0, v_texCoord);"
               "    col_formask.rgb = col_formask.rgb * u_multiplyColor.rgb;"
               "    col_formask.rgb = col_formask.rgb + u_screenColor.rgb - (col_formask.rgb * u_screenColor.rgb);"
               "    col_formask = col_formask * u_baseColor;"
               "    col_formask.rgb = col_formask.rgb * col_formask.a;"
-              "    vec4 clipMask = texture(s_texture1, v_clipPos.xy / v_clipPos.w) * u_channelFlag;"
+              "    vec4 clipMask = texture2D(s_texture1, v_clipPos.xy / v_clipPos.w) * u_channelFlag;"
               "    float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;"
               "    col_formask = col_formask * maskVal;"
               "    gl_FragColor = col_formask;}")
diff --git a/package/live2d/v2/core/param/pivot_manager.py b/package/live2d/v2/core/param/pivot_manager.py
@@ -65,7 +65,12 @@ def calcPivotValues(self, mdc: 'ModelContext', ret: List[bool]):
                     aS = aM[0]
                     if aU < aS - GOSA:
                         aP = 0
-                        ret[0] = True
+                        # TODO: 不清楚原因，需要找其他模型测试
+                        # 其他分支对ret的赋值有可能导致问题
+                        if isinstance(ret, list): # by heurry@Github
+                            ret[0] = True
+                        else:
+                            ret = [True]
                     else:
                         if aU < aS + GOSA:
                             aP = 0
diff --git a/package/main_pygame.py b/package/main_pygame.py
@@ -11,11 +11,10 @@
 import pygame
 from pygame.locals import *
 
+# roation is only for v3
 import live2d.v3 as live2d
 from live2d.v3 import StandardParams
 from live2d.utils import log
-# import live2d.v2 as live2d
-# from live2d.v2 import StandardParams
 
 
 import resources
@@ -38,20 +37,19 @@ def main():
 
     model = live2d.LAppModel()
 
-    if live2d.LIVE2D_VERSION == 3:
-        model.LoadModelJson(
-            # os.path.join(resources.RESOURCES_DIRECTORY, "v3/liveroid/liveroiD_A-Y01/liveroiD_A-Y01.model3.json")
-            # os.path.join(resources.RESOURCES_DIRECTORY, "v3/Mao/Mao.model3.json")
-            os.path.join(resources.RESOURCES_DIRECTORY, "v3/llny/llny.model3.json")
-            # os.path.join(resources.RESOURCES_DIRECTORY, "v3/nn/nn.model3.json")
-            # os.path.join(resources.RESOURCES_DIRECTORY, "v3/magic/magic.model3.json")
-            # os.path.join(resources.RESOURCES_DIRECTORY, "v3/Haru/Haru.model3.json")
-            # os.path.join(resources.RESOURCES_DIRECTORY, "v3/Hiyori/Hiyori.model3.json")
-        )
-    else:
-        model.LoadModelJson(
-            os.path.join(resources.RESOURCES_DIRECTORY, "v2/kasumi2/kasumi2.model.json")
-        )
+
+    model.LoadModelJson(
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/liveroid/liveroiD_A-Y01/liveroiD_A-Y01.model3.json")
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/Mao/Mao.model3.json")
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/llny/llny.model3.json")
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/nn/nn.model3.json")
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/magic/magic.model3.json")
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/Haru/Haru.model3.json")
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/Hiyori/Hiyori.model3.json")
+        os.path.join(resources.RESOURCES_DIRECTORY, "v3/小九/小九皮套（红）/小九.model3.json")
+        # os.path.join(resources.RESOURCES_DIRECTORY, "v3/金发大小姐/金发大小姐.model3.json")
+    )
+
 
     model.Resize(*display)
 
diff --git a/package/main_pygame_simple.py b/package/main_pygame_simple.py
@@ -23,7 +23,10 @@ def main():
         )
     else:
         model.LoadModelJson(
-            os.path.join(resources.RESOURCES_DIRECTORY, "v2/kasumi2/kasumi2.model.json")
+            os.path.join(resources.RESOURCES_DIRECTORY, 
+                        #  "v2/kasumi2/kasumi2.model.json"
+                        "v2/haru/haru.model.json"
+                         )
         )
 
     model.Resize(*display)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,10 @@ def main():`
`23`	`23`	`)`
`24`	`24`	`else:`
`25`	`25`	`model.LoadModelJson(`
`26`		`- os.path.join(resources.RESOURCES_DIRECTORY, "v2/kasumi2/kasumi2.model.json")`
	`26`	`+ os.path.join(resources.RESOURCES_DIRECTORY,`
	`27`	`+ # "v2/kasumi2/kasumi2.model.json"`
	`28`	`+ "v2/haru/haru.model.json"`
	`29`	`+ )`
`27`	`30`	`)`
`28`	`31`
`29`	`32`	`model.Resize(*display)`