Skip to content

Commit

Permalink
Undo Style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Spiderguy-F committed Mar 20, 2024
1 parent a4a9164 commit 0a35420
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
8 changes: 1 addition & 7 deletions addons/io_hubs_addon/io/gltf_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,28 +149,22 @@ def gather_node_hook(self, gltf2_object, blender_object, export_settings):
self.add_hubs_components(gltf2_object, blender_object, export_settings)

def gather_material_hook(self, gltf2_object, blender_material, export_settings):
print("Gathering material:", blender_material.name)
if blender_material.name == "WithLightmap":
print("export_settings:", export_settings)
if not self.properties.enabled:
print("Not enabled")
return

self.add_hubs_components(
gltf2_object, blender_material, export_settings)
print("added components")
from .utils import gather_lightmap_texture_info
if blender_material.node_tree and blender_material.use_nodes:
lightmap_texture_info = gather_lightmap_texture_info(
blender_material, export_settings)
print("gathered lightmap texture info:", lightmap_texture_info)
if lightmap_texture_info:
gltf2_object.extensions["MOZ_lightmap"] = self.Extension(
name="MOZ_lightmap",
extension=lightmap_texture_info,
required=False,
)
print("Hook done")

def gather_material_unlit_hook(self, gltf2_object, blender_material, export_settings):
self.gather_material_hook(
gltf2_object, blender_material, export_settings)
Expand Down
15 changes: 12 additions & 3 deletions addons/io_hubs_addon/nodes/lightmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@ def poll(cls, context):
]),
]


class NODE_MT_mozilla_hubs_nodes(bpy.types.Menu):
"""Add node menu for Blender 4.x"""
bl_label = "Hubs"
bl_idname = "NODE_MT_mozilla_hubs_nodes"

def draw(self, context):
layout = self.layout
layout.operator("node.add_node", text="MOZ_lightmap settings").type = "moz_lightmap.node"


class MozLightmapNode(Node):
"""MOZ_lightmap settings node"""
bl_idname = 'moz_lightmap.node'
Expand All @@ -51,40 +54,46 @@ def draw_buttons(self, context, layout):
def draw_label(self):
return "MOZ_lightmap"


def create_node_categories():
return [NodeCategory("MOZ_NODES", "Moz Nodes", items=node_categories)]


def menu_func(self, context):
self.layout.menu("NODE_MT_mozilla_hubs_nodes")


def register_blender_4():
print("Using Blender 4x")
bpy.utils.register_class(NODE_MT_mozilla_hubs_nodes)
bpy.types.NODE_MT_shader_node_add_all.append(menu_func)
bpy.utils.register_class(MozLightmapNode)


def unregister_blender_4():
bpy.types.NODE_MT_shader_node_add_all.remove(menu_func)
bpy.utils.unregister_class(NODE_MT_mozilla_hubs_nodes)
bpy.utils.unregister_class(MozLightmapNode)


def register_blender_3():
print("Using Blender 3x")
bpy.utils.register_class(MozLightmapNode)
nodeitems_utils.register_node_categories("MOZ_NODES", node_categories)


def unregister_blender_3():
bpy.utils.unregister_class(MozLightmapNode)
nodeitems_utils.unregister_node_categories("MOZ_NODES", node_categories)


def register():
if bpy.app.version < (4, 0, 0):
register_blender_3()
else:
register_blender_4()


def unregister():
if bpy.app.version < (4, 0, 0):
unregister_blender_3()
else:
unregister_blender_4()
unregister_blender_4()

0 comments on commit 0a35420

Please sign in to comment.