ApfelTeeSaft/lightspeed64
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/lightspeed64.git synced 2026-09-02 12:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added option to set speed of individual points of a spline. (thanks to Kaze)

Browse Source
This commit is contained in:
kurethedead
2020-10-21 17:07:50 -07:00
parent 7c5379e77b
commit be0a3cb77e
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fast64_internal/sm64_objects.py
+1 -1
View File
@@ -422,7 +422,7 @@ def exportAreaCommon(areaObj, transformMatrix, geolayout, collision, name):
area = SM64_Area(areaObj.areaIndex, musicSeq, areaObj.music_preset,
terrainType, geolayout, collision,
[areaObj.warpNodes[i].to_c() for i in range(len(areaObj.warpNodes))],
name + '_' + areaObj.name, areaObj.startDialog if areaObj.showStartDialog else None)
name, areaObj.startDialog if areaObj.showStartDialog else None)
start_process_sm64_objects(areaObj, area, transformMatrix, False)
fast64_internal/sm64_spline.py
+12 -11
View File
@@ -10,11 +10,11 @@ enumSplineTypes = [
]
class SM64Spline:
def __init__(self, name, splineType, speed):
def __init__(self, name, splineType):
self.name = toAlnum(name)
self.splineType = splineType
self.points = []
self.speed = speed
self.speeds = []
def to_c(self):
data = ''
@@ -38,7 +38,7 @@ class SM64Spline:
else:
splineIndex = index
data += "\t{ " + str(splineIndex) \
+ ", " + str(self.speed) \
+ ", " + str(int(round(self.speeds[index]))) \
+ ", { " + str(int(round(point[0]))) \
+ ", " + str(int(round(point[1]))) \
+ ", " + str(int(round(point[2]))) \
@@ -52,8 +52,8 @@ class SM64Spline:
if index >= len(self.points) - 3:
speed = 0 # last 3 points of spline
else:
speed = self.speed
data += "\t{ " + str(speed) \
speed = self.speeds[index]
data += "\t{ " + str(int(round(speed))) \
+ ", " + str(int(round(point[0]))) \
+ ", " + str(int(round(point[1]))) \
+ ", " + str(int(round(point[2]))) \
@@ -74,12 +74,13 @@ class SM64Spline:
raise PluginError("Invalid SM64 spline type: " + self.splineType)
def convertSplineObject(name, obj, transform):
sm64_spline = SM64Spline(name, obj.data.sm64_spline_type, obj.data.spline_speed)
sm64_spline = SM64Spline(name, obj.data.sm64_spline_type)
spline = obj.data.splines.active
for point in spline.points:
position = transform @ point.co
sm64_spline.points.append(position)
sm64_spline.speeds.append(int(round(point.radius)))
return sm64_spline
@@ -123,7 +124,11 @@ class SM64SplinePanel(bpy.types.Panel):
prop_split(box, curve, 'sm64_spline_type', 'Spline Type')
if curve.sm64_spline_type == 'Cutscene' or\
curve.sm64_spline_type == 'Vector':
prop_split(box, curve, 'spline_speed', "Speed")
pointIndex = 0
for point in curve.splines.active.points:
if point.select:
prop_split(box.box(), point, 'radius', 'Point ' + str(pointIndex) + " Speed")
pointIndex += 1
def isCurveValid(obj):
curve = obj.data
@@ -140,13 +145,9 @@ def sm64_spline_register():
bpy.types.Curve.sm64_spline_type = bpy.props.EnumProperty(
name = 'Type', items = enumSplineTypes, update = onSplineTypeSet)
bpy.types.Curve.spline_speed = bpy.props.IntProperty(
name = "Speed", default = 50)
def sm64_spline_unregister():
del bpy.types.Curve.sm64_spline_type
del bpy.types.Curve.spline_speed
for cls in reversed(sm64_spline_classes):
unregister_class(cls)