Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Codebase] Automatically find or add world #334

Merged
merged 9 commits into from
Aug 20, 2024
5 changes: 3 additions & 2 deletions fast64_internal/f3d/f3d_bleed.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from dataclasses import dataclass, field

from ..utility import create_or_get_world
from .f3d_gbi import (
GfxTag,
GfxListTag,
Expand Down Expand Up @@ -63,7 +64,7 @@ def __init__(self):
self.build_default_othermodes()

def build_default_geo(self):
defaults = bpy.context.scene.world.rdp_defaults
defaults = create_or_get_world(bpy.context.scene).rdp_defaults

setGeo = SPSetGeometryMode([])
clearGeo = SPClearGeometryMode([])
Expand Down Expand Up @@ -91,7 +92,7 @@ def place_in_flaglist(flag: bool, enum: str, set_list: SPSetGeometryMode, clear_
self.default_clear_geo = clearGeo

def build_default_othermodes(self):
defaults = bpy.context.scene.world.rdp_defaults
defaults = create_or_get_world(bpy.context.scene).rdp_defaults

othermode_H = SPSetOtherMode("G_SETOTHERMODE_H", 4, 20 - self.is_f3d_old, [])
# if the render mode is set, it will be consider non-default a priori
Expand Down
2 changes: 1 addition & 1 deletion fast64_internal/f3d/f3d_material.py
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ def ui_procAnim(material, layout, useTex0, useTex1, title, useDropdown):


def update_node_values(self, context, update_preset):
if hasattr(context.scene, "world") and self == context.scene.world.rdp_defaults:
if hasattr(context.scene, "world") and self == create_or_get_world(context.scene).rdp_defaults:
pass

with F3DMaterial_UpdateLock(get_material_from_context(context)) as material:
Expand Down
4 changes: 2 additions & 2 deletions fast64_internal/f3d/f3d_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ def addCullCommand(obj, fMesh, transformMatrix, matWriteMethod):
)

if matWriteMethod == GfxMatWriteMethod.WriteDifferingAndRevert:
defaults = bpy.context.scene.world.rdp_defaults
defaults = create_or_get_world(bpy.context.scene).rdp_defaults
if defaults.g_lighting:
cullCommands = [
SPClearGeometryMode(["G_LIGHTING"]),
Expand Down Expand Up @@ -1321,7 +1321,7 @@ def saveOrGetF3DMaterial(material, fModel, obj, drawLayer, convertTextureData):
fMaterial = fModel.addMaterial(materialName)
useDict = all_combiner_uses(f3dMat)

defaults = bpy.context.scene.world.rdp_defaults
defaults = create_or_get_world(bpy.context.scene).rdp_defaults
if fModel.f3d.F3DEX_GBI_2:
saveGeoModeDefinitionF3DEX2(fMaterial, f3dMat.rdp_settings, defaults, fModel.matWriteMethod)
else:
Expand Down
5 changes: 4 additions & 1 deletion fast64_internal/oot/f3d/panels.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ def poll(cls, context):
return context.scene.gameEditorMode == "OOT"

def draw(self, context):
ootDefaultRenderModeProp: OOTDefaultRenderModesProperty = context.scene.world.ootDefaultRenderModes
world = context.scene.world
if not world:
return
ootDefaultRenderModeProp: OOTDefaultRenderModesProperty = world.ootDefaultRenderModes
ootDefaultRenderModeProp.draw_props(self.layout)


Expand Down
4 changes: 2 additions & 2 deletions fast64_internal/oot/oot_model_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Union
from ..f3d.f3d_parser import F3DContext, F3DTextureReference, getImportData
from ..f3d.f3d_material import TextureProperty, createF3DMat, texFormatOf, texBitSizeF3D
from ..utility import PluginError, CData, hexOrDecInt, getNameFromPath, getTextureSuffixFromFormat, toAlnum
from ..utility import PluginError, hexOrDecInt, create_or_get_world
from ..f3d.flipbook import TextureFlipbook, FlipbookProperty, usesFlipbook, ootFlipbookReferenceIsValid

from ..f3d.f3d_writer import VertexGroupInfo, TriangleConverterInfo
Expand Down Expand Up @@ -118,7 +118,7 @@ def getRenderMode(self, drawLayer):
drawLayerUsed = self.drawLayerOverride
else:
drawLayerUsed = drawLayer
defaultRenderModes = bpy.context.scene.world.ootDefaultRenderModes
defaultRenderModes = create_or_get_world(bpy.context.scene).ootDefaultRenderModes
cycle1 = getattr(defaultRenderModes, drawLayerUsed.lower() + "Cycle1")
cycle2 = getattr(defaultRenderModes, drawLayerUsed.lower() + "Cycle2")
return [cycle1, cycle2]
Expand Down
12 changes: 7 additions & 5 deletions fast64_internal/sm64/sm64_f3d_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
)

from ..utility import (
CData,
CScrollData,
PluginError,
raisePluginError,
Expand All @@ -73,6 +72,7 @@
makeWriteInfoBox,
writeBoxExportType,
enumExportHeaderType,
create_or_get_world,
)

from .sm64_constants import (
Expand Down Expand Up @@ -106,8 +106,9 @@ def getDrawLayerV3(self, obj):
return int(obj.draw_layer_static)

def getRenderMode(self, drawLayer):
cycle1 = getattr(bpy.context.scene.world, "draw_layer_" + str(drawLayer) + "_cycle_1")
cycle2 = getattr(bpy.context.scene.world, "draw_layer_" + str(drawLayer) + "_cycle_2")
world = create_or_get_world(bpy.context.scene)
cycle1 = getattr(world, "draw_layer_" + str(drawLayer) + "_cycle_1")
cycle2 = getattr(world, "draw_layer_" + str(drawLayer) + "_cycle_2")
return [cycle1, cycle2]


Expand Down Expand Up @@ -866,9 +867,10 @@ def poll(cls, context):

def draw(self, context):
world = context.scene.world
layout = self.layout
if not world:
return

inputGroup = layout.column()
inputGroup = self.layout.column()
inputGroup.prop(
world, "menu_layers", text="Draw Layers", icon="TRIA_DOWN" if world.menu_layers else "TRIA_RIGHT"
)
Expand Down
21 changes: 20 additions & 1 deletion fast64_internal/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from mathutils import *
from .utility_anim import *
from typing import Callable, Iterable, Any, Optional, Tuple, TypeVar, Union
from bpy.types import UILayout
from bpy.types import UILayout, Scene, World

CollectionProperty = Any # collection prop as defined by using bpy.props.CollectionProperty

Expand Down Expand Up @@ -1868,3 +1868,22 @@ def upgrade_old_prop(
print(f"Failed to upgrade {new_prop} from old location {old_loc} with props {old_props}")
traceback.print_exc()
return False


def create_or_get_world(scene: Scene) -> World:
"""
Given a scene, this function will return:
- The world selected in the scene if the scene has a selected world.
- The first world in bpy.data.worlds if the current file has a world. (Which it almost always does because of the f3d nodes library)
- Create a world named "Fast64" and return it if no world exits.
This function does not assign any world to the scene.
"""
if scene.world:
return scene.world
if bpy.data.worlds:
world: World = bpy.data.worlds.values()[0]
print(f'No world selected in scene, selected the first one found in this file "{world.name}".')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually I just realized this severely spams the console. Could you add a counter for this print and only print it the first 10 times or something
use a dirty global variable :)

return world
# Almost never reached because the node library has its own world
print(f'No world in this file, creating world named "Fast64".')
return bpy.data.worlds.new("Fast64")
Loading