Skip to content

Commit

Permalink
Minor unused stuff cleanup (mostly OoT) (#289)
Browse files Browse the repository at this point in the history
* minor unused stuff cleanup

* review
  • Loading branch information
Yanis002 authored Jan 24, 2024
1 parent b05273b commit 84967dc
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 59 deletions.
18 changes: 0 additions & 18 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,23 +177,6 @@ def draw(self, context):
col.box().label(text="Width/height must be < 1024. Must be png format.")


class Fast64_GlobalObjectPanel(bpy.types.Panel):
bl_label = "Global Object Inspector"
bl_idname = "OBJECT_PT_OOT_Global_Object_Inspector"
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
bl_context = "object"
bl_options = {"HIDE_HEADER"}

@classmethod
def poll(cls, context):
return context.object is not None and context.object.type == "EMPTY"

def draw(self, context):
box = self.layout
prop_split(box, context.scene, "gameEditorMode", "Game")


class Fast64_GlobalSettingsPanel(bpy.types.Panel):
bl_idname = "FAST64_PT_global_settings"
bl_label = "Fast64 Global Settings"
Expand Down Expand Up @@ -391,7 +374,6 @@ def draw(self, context):
AddBoneGroups,
CreateMetarig,
SM64_AddWaterBox,
# Fast64_GlobalObjectPanel,
F3D_GlobalSettingsPanel,
Fast64_GlobalSettingsPanel,
SM64_ArmatureToolsPanel,
Expand Down
1 change: 0 additions & 1 deletion fast64_internal/oot/collision/properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class OOTCollisionExportSettings(PropertyGroup):
)
filename: StringProperty(name="Filename")
exportPath: StringProperty(name="Directory", subtype="FILE_PATH")
exportLevel: EnumProperty(items=ootEnumSceneID, name="Level Used By Collision", default="SCENE_DEKU_TREE")
includeChildren: BoolProperty(name="Include child objects", default=True)
levelName: StringProperty(name="Name", default="SCENE_DEKU_TREE")
customExport: BoolProperty(
Expand Down
13 changes: 0 additions & 13 deletions fast64_internal/oot/cutscene/motion/operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,6 @@
)


def getActorCueList(operator: Operator, context: Context) -> Object | None:
cueListObj = activeObj = context.view_layer.objects.active

if activeObj.ootEmptyType == "CS Actor Cue" and activeObj.parent.ootEmptyType == "CS Actor Cue List":
cueListObj = activeObj.parent

if not cueListObj.ootEmptyType == "CS Actor Cue List" and cueListObj.parent.ootEmptyType == "Cutscene":
operator.report({"WARNING"}, "Select an action list or action point.")
return None

return cueListObj


def createNewActorCueList(csObj: Object, isPlayer: bool):
"""Creates a new Actor or Player Cue List and adds one basic cue and the dummy one"""
objFactory = CutsceneObjectFactory()
Expand Down
6 changes: 0 additions & 6 deletions fast64_internal/oot/oot_collision.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@
)


def drawCameraPosProperty(layout, cameraRefProp, index, headerIndex, objName):
camBox = layout.box().column()
prop_split(camBox, cameraRefProp, "camera", "Camera " + str(index))
drawCollectionOps(camBox, index, "Camera Position", headerIndex, objName)


# water boxes handled by level writer
def exportCollisionCommon(collision, obj, transformMatrix, includeChildren, name):
bpy.ops.object.select_all(action="DESELECT")
Expand Down
3 changes: 0 additions & 3 deletions fast64_internal/oot/oot_level_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,6 @@ def __init__(self, index, name, model, roomShape):
self.showInvisibleActors = False
self.linkIdleMode = None

self.customBehaviourX = None
self.customBehaviourY = None

# Wind
self.setWind = False
self.windVector = [0, 0, 0]
Expand Down
11 changes: 0 additions & 11 deletions fast64_internal/oot/oot_model_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,6 @@ def onAddMesh(self, fMesh, contextObj):
fMesh.draw.commands.append(SPMatrix("0x01000000", "G_MTX_MODELVIEW | G_MTX_NOPUSH | G_MTX_MUL"))


class OOTDynamicMaterialDrawLayer:
def __init__(self, opaque, transparent):
self.opaque = opaque
self.transparent = transparent


class OOTGfxFormatter(GfxFormatter):
def __init__(self, scrollMethod):
GfxFormatter.__init__(self, scrollMethod, 64, None)
Expand Down Expand Up @@ -508,8 +502,3 @@ def clearOOTFlipbookProperty(flipbookProp):
flipbookProp.name = "sFlipbookTextures"
flipbookProp.exportMode = "Array"
flipbookProp.textures.clear()


def clearOOTMaterialDrawLayerProperty(matDrawLayerProp):
for i in range(0x08, 0x0E):
setattr(matDrawLayerProp, "segment" + format(i, "X"), False)
7 changes: 0 additions & 7 deletions fast64_internal/oot/room/properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ class OOTRoomHeaderProperty(PropertyGroup):
default=False,
)

useCustomBehaviourX: BoolProperty(name="Use Custom Behaviour X")
useCustomBehaviourY: BoolProperty(name="Use Custom Behaviour Y")

customBehaviourX: StringProperty(name="Custom Behaviour X", default="0x00")

customBehaviourY: StringProperty(name="Custom Behaviour Y", default="0x00")

setWind: BoolProperty(name="Set Wind")
windVector: IntVectorProperty(name="Wind Vector", size=3, min=-127, max=127)
windStrength: IntProperty(name="Wind Strength", min=0, max=255)
Expand Down

0 comments on commit 84967dc

Please sign in to comment.