diff --git a/README.md b/README.md index b0a3943a..3ee8c102 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ This addon extends the glTF 2.0 exporter to support the `MOZ_hubs_components` and `MOZ_lightmap` extensions allowing you to add behavior to glTF assets for Hubs. -[![Test](https://github.com/MozillaReality/hubs-blender-exporter/actions/workflows/test.yml/badge.svg)](https://github.com/MozillaReality/hubs-blender-exporter/actions/workflows/test.yml) -[![Publish](https://github.com/MozillaReality/hubs-blender-exporter/actions/workflows/publish.yml/badge.svg)](https://github.com/MozillaReality/hubs-blender-exporter/actions/workflows/publish.yml) +[![Test](https://github.com/Hubs-Foundation/hubs-blender-exporter/actions/workflows/test.yml/badge.svg)](https://github.com/Hubs-Foundation/hubs-blender-exporter/actions/workflows/test.yml) +[![Publish](https://github.com/Hubs-Foundation/hubs-blender-exporter/actions/workflows/publish.yml/badge.svg)](https://github.com/Hubs-Foundation/hubs-blender-exporter/actions/workflows/publish.yml) # To Install -Find the latest [release](https://github.com/MozillaReality/hubs-blender-exporter/releases) and download the add-on zip file. +Find the latest [release](https://github.com/Hubs-Foundation/hubs-blender-exporter/releases) and download the add-on zip file. select add-on zip file @@ -58,7 +58,7 @@ It is also possible to use the GLB file to replace the scene for an existing Hub # Scene debugger -The Hubs Blender add-on includes a scene debugger, enabling you to see the Blender scene updates in Hubs with just one click. For additional information, please visit: https://github.com/MozillaReality/hubs-blender-exporter/wiki/Hubs-scene-debugger/ +The Hubs Blender add-on includes a scene debugger, enabling you to see the Blender scene updates in Hubs with just one click. For additional information, please visit: https://github.com/Hubs-Foundation/hubs-blender-exporter/wiki/Hubs-scene-debugger/ # Development diff --git a/addons/io_hubs_addon/__init__.py b/addons/io_hubs_addon/__init__.py index d3a4865a..1e790a63 100644 --- a/addons/io_hubs_addon/__init__.py +++ b/addons/io_hubs_addon/__init__.py @@ -9,13 +9,13 @@ from . import icons bl_info = { "name": "Hubs Blender Addon", - "author": "Mozilla Hubs", + "author": "The Hubs Community", "description": "Tools for developing glTF assets for Hubs", "blender": (3, 1, 2), "version": (1, 5, 0, "dev_build"), "location": "", - "wiki_url": "https://github.com/MozillaReality/hubs-blender-exporter", - "tracker_url": "https://github.com/MozillaReality/hubs-blender-exporter/issues", + "wiki_url": "https://github.com/Hubs-Foundation/hubs-blender-exporter", + "tracker_url": "https://github.com/Hubs-Foundation/hubs-blender-exporter/issues", "support": "COMMUNITY", "warning": "", "category": "Generic" diff --git a/addons/io_hubs_addon/components/definitions/audio.py b/addons/io_hubs_addon/components/definitions/audio.py index 5dba4c79..958b2fdc 100644 --- a/addons/io_hubs_addon/components/definitions/audio.py +++ b/addons/io_hubs_addon/components/definitions/audio.py @@ -19,7 +19,7 @@ class Audio(HubsComponent): } src: StringProperty( - name="Audio URL", description="Audio URL", default='https://mozilla.org') + name="Audio URL", description="Audio URL", default='https://example.org/AudioFile.mp3') autoPlay: BoolProperty(name="Auto Play", description="Auto Play", diff --git a/addons/io_hubs_addon/components/definitions/image.py b/addons/io_hubs_addon/components/definitions/image.py index f736fff3..77e1ddf2 100644 --- a/addons/io_hubs_addon/components/definitions/image.py +++ b/addons/io_hubs_addon/components/definitions/image.py @@ -20,7 +20,7 @@ class Image(HubsComponent): } src: StringProperty( - name="Image URL", description="The web address of the image", default="https://mozilla.org") + name="Image URL", description="The web address of the image", default="https://example.org/ImageFile.webp") controls: BoolProperty( name="Controls", diff --git a/addons/io_hubs_addon/components/definitions/link.py b/addons/io_hubs_addon/components/definitions/link.py index a0cb5c84..a26eeb5d 100644 --- a/addons/io_hubs_addon/components/definitions/link.py +++ b/addons/io_hubs_addon/components/definitions/link.py @@ -19,7 +19,7 @@ class Link(HubsComponent): } href: StringProperty(name="Link URL", description="Link URL", - default="https://mozilla.org") + default="https://example.org") def migrate(self, migration_type, panel_type, instance_version, host, migration_report, ob=None): migration_occurred = False diff --git a/addons/io_hubs_addon/components/definitions/model.py b/addons/io_hubs_addon/components/definitions/model.py index f2072cbf..f3d15526 100644 --- a/addons/io_hubs_addon/components/definitions/model.py +++ b/addons/io_hubs_addon/components/definitions/model.py @@ -17,7 +17,7 @@ class Model(HubsComponent): } src: StringProperty(name="Model URL", description="Model URL", - default="https://mozilla.org") + default="https://example.org/ModelFile.glb") def migrate(self, migration_type, panel_type, instance_version, host, migration_report, ob=None): migration_occurred = False diff --git a/addons/io_hubs_addon/components/definitions/particle_emitter.py b/addons/io_hubs_addon/components/definitions/particle_emitter.py index 84c64e79..42cfd091 100644 --- a/addons/io_hubs_addon/components/definitions/particle_emitter.py +++ b/addons/io_hubs_addon/components/definitions/particle_emitter.py @@ -26,7 +26,7 @@ class ParticleEmitter(HubsComponent): src: StringProperty( name="Image Source", description="The web address (URL) of the image to use for each particle", - default="https://hmc-assets.reticulum.io/spoke/assets/images/dot-75db99b125fe4e9afbe58696320bea73.png") + default="https://example.org/spoke/assets/images/dot-75db99b125fe4e9afbe58696320bea73.png") ageRandomness: FloatProperty( name="Age Randomness", description="Age Randomness", default=10.0) diff --git a/addons/io_hubs_addon/components/definitions/pdf.py b/addons/io_hubs_addon/components/definitions/pdf.py index 8fd363bd..6f6eaede 100644 --- a/addons/io_hubs_addon/components/definitions/pdf.py +++ b/addons/io_hubs_addon/components/definitions/pdf.py @@ -17,7 +17,7 @@ class PDF(HubsComponent): 'version': (1, 0, 0) } src: StringProperty( - name="PDF URL", description="The web address of the PDF", default='https://mozilla.org') + name="PDF URL", description="The web address of the PDF", default='https://example.org/PdfFile.pdf') controls: BoolProperty( name="Controls", description="When enabled, shows pagination buttons when hovering your cursor over it in Hubs that allow you to switch pages", diff --git a/addons/io_hubs_addon/components/definitions/spawner.py b/addons/io_hubs_addon/components/definitions/spawner.py index a2ae75f3..ec536e34 100644 --- a/addons/io_hubs_addon/components/definitions/spawner.py +++ b/addons/io_hubs_addon/components/definitions/spawner.py @@ -18,7 +18,7 @@ class Spawner(HubsComponent): src: StringProperty( name="Model Source", description="The web address (URL) of the glTF to be spawned", - default="https://mozilla.org") + default="https://example.org/ModelFile.glb") applyGravity: BoolProperty( name="Apply Gravity", description="Apply gravity to spawned object", default=False) diff --git a/addons/io_hubs_addon/components/definitions/video.py b/addons/io_hubs_addon/components/definitions/video.py index bb847b11..647976a3 100644 --- a/addons/io_hubs_addon/components/definitions/video.py +++ b/addons/io_hubs_addon/components/definitions/video.py @@ -20,7 +20,7 @@ class Video(HubsComponent): } src: StringProperty( - name="Video URL", description="The web address of the video", default='https://mozilla.org') + name="Video URL", description="The web address of the video", default='https://example.org/VideoFile.webm') projection: EnumProperty( name="Projection", diff --git a/addons/io_hubs_addon/nodes/lightmap.py b/addons/io_hubs_addon/nodes/lightmap.py index 84f6d709..ff558cdc 100644 --- a/addons/io_hubs_addon/nodes/lightmap.py +++ b/addons/io_hubs_addon/nodes/lightmap.py @@ -19,13 +19,13 @@ def poll(cls, context): def add_node_menu_blender4(self, context): - self.layout.menu("NODE_MT_mozilla_hubs_nodes") + self.layout.menu("NODE_MT_moz_nodes") -class NODE_MT_mozilla_hubs_nodes(bpy.types.Menu): +class NODE_MT_moz_nodes(bpy.types.Menu): """Add node menu for Blender 4.x""" bl_label = "Hubs" - bl_idname = "NODE_MT_mozilla_hubs_nodes" + bl_idname = "NODE_MT_moz_nodes" def draw(self, context): layout = self.layout @@ -61,14 +61,14 @@ def draw_label(self): def register_blender_4(): - bpy.utils.register_class(NODE_MT_mozilla_hubs_nodes) + bpy.utils.register_class(NODE_MT_moz_nodes) bpy.types.NODE_MT_shader_node_add_all.append(add_node_menu_blender4) bpy.utils.register_class(MozLightmapNode) def unregister_blender_4(): bpy.types.NODE_MT_shader_node_add_all.remove(add_node_menu_blender4) - bpy.utils.unregister_class(NODE_MT_mozilla_hubs_nodes) + bpy.utils.unregister_class(NODE_MT_moz_nodes) bpy.utils.unregister_class(MozLightmapNode) diff --git a/tests/scenes/audio.blend b/tests/scenes/audio.blend index 22e41795..497caa61 100644 Binary files a/tests/scenes/audio.blend and b/tests/scenes/audio.blend differ diff --git a/tests/scenes/environment-settings.blend b/tests/scenes/environment-settings.blend index cf6cec9c..5d4152d3 100644 Binary files a/tests/scenes/environment-settings.blend and b/tests/scenes/environment-settings.blend differ diff --git a/tests/scenes/image.blend b/tests/scenes/image.blend index 78aae3e6..172952b1 100644 Binary files a/tests/scenes/image.blend and b/tests/scenes/image.blend differ diff --git a/tests/scenes/link.blend b/tests/scenes/link.blend index a4e598cc..86cf260a 100644 Binary files a/tests/scenes/link.blend and b/tests/scenes/link.blend differ diff --git a/tests/scenes/model.blend b/tests/scenes/model.blend index bbb9c205..ead706d7 100644 Binary files a/tests/scenes/model.blend and b/tests/scenes/model.blend differ diff --git a/tests/scenes/pdf.blend b/tests/scenes/pdf.blend index a1904c53..01d2f623 100644 Binary files a/tests/scenes/pdf.blend and b/tests/scenes/pdf.blend differ diff --git a/tests/scenes/spawner.blend b/tests/scenes/spawner.blend index efcfa731..c0c50110 100644 Binary files a/tests/scenes/spawner.blend and b/tests/scenes/spawner.blend differ diff --git a/tests/scenes/video.blend b/tests/scenes/video.blend index 8203d120..eb9c6881 100644 Binary files a/tests/scenes/video.blend and b/tests/scenes/video.blend differ diff --git a/tests/test/tests/audio.js b/tests/test/tests/audio.js index 6e2824df..28b06517 100644 --- a/tests/test/tests/audio.js +++ b/tests/test/tests/audio.js @@ -17,7 +17,7 @@ module.exports = { const ext = node.extensions['MOZ_hubs_components']; assert.deepStrictEqual(ext["audio"], { - "src": "https://uploads-prod.reticulum.io/files/a3670163-1e78-485c-b70d-9af51f6afaff.mp3", + "src": "https://example.org/files/a3670163-1e78-485c-b70d-9af51f6afaff.mp3", "autoPlay": true, "controls": true, "loop": true @@ -35,4 +35,4 @@ module.exports = { }); assert.strictEqual(utils.UUID_REGEX.test(ext['networked']['id']), true); } -}; \ No newline at end of file +}; diff --git a/tests/test/tests/image.js b/tests/test/tests/image.js index 6a15299d..a2d59029 100644 --- a/tests/test/tests/image.js +++ b/tests/test/tests/image.js @@ -17,7 +17,7 @@ module.exports = { const ext = node.extensions['MOZ_hubs_components']; assert.deepStrictEqual(ext["image"], { - "src": "https://uploads-prod.reticulum.io/files/81e942e8-6ae2-4cc5-b363-f064e9ea3f61.jpg", + "src": "https://example.org/files/81e942e8-6ae2-4cc5-b363-f064e9ea3f61.jpg", "controls": true, "alphaCutoff": 0.5, "alphaMode": "opaque", diff --git a/tests/test/tests/link.js b/tests/test/tests/link.js index 1b3ee58e..524112b8 100644 --- a/tests/test/tests/link.js +++ b/tests/test/tests/link.js @@ -16,7 +16,7 @@ module.exports = { assert.strictEqual(utils.checkExtensionAdded(node, 'MOZ_hubs_components'), true); const ext = node.extensions['MOZ_hubs_components']; - assert.deepStrictEqual(ext['link'], { href: 'https://hubs.mozilla.com' }); + assert.deepStrictEqual(ext['link'], { href: 'https://example.org' }); assert.strictEqual(utils.UUID_REGEX.test(ext['networked']['id']), true); } -}; \ No newline at end of file +}; diff --git a/tests/test/tests/model.js b/tests/test/tests/model.js index b88e953d..9501f08f 100644 --- a/tests/test/tests/model.js +++ b/tests/test/tests/model.js @@ -17,8 +17,8 @@ module.exports = { const ext = node.extensions['MOZ_hubs_components']; assert.deepStrictEqual(ext["model"], { - "src": "https://mozilla.org" + "src": "https://example.org/ModelFile.glb" }); assert.strictEqual(utils.UUID_REGEX.test(ext['networked']['id']), true); } -}; \ No newline at end of file +}; diff --git a/tests/test/tests/spawner.js b/tests/test/tests/spawner.js index e33a4809..3d78539d 100644 --- a/tests/test/tests/spawner.js +++ b/tests/test/tests/spawner.js @@ -18,11 +18,11 @@ module.exports = { const ext = node.extensions['MOZ_hubs_components']; assert.deepStrictEqual(ext, { "spawner": { - "src": "https://uploads-prod.reticulum.io/files/81e942e8-6ae2-4cc5-b363-f064e9ea3f61.jpg", + "src": "https://example.org/files/81e942e8-6ae2-4cc5-b363-f064e9ea3f61.jpg", "mediaOptions": { "applyGravity": true } } }); } -}; \ No newline at end of file +}; diff --git a/tests/test/tests/video.js b/tests/test/tests/video.js index 270d1455..d42419da 100644 --- a/tests/test/tests/video.js +++ b/tests/test/tests/video.js @@ -17,7 +17,7 @@ module.exports = { const ext = node.extensions['MOZ_hubs_components']; assert.deepStrictEqual(ext["video"], { - "src": "https://uploads-prod.reticulum.io/files/b4dc97b5-6523-4b61-91ae-d14a80ffd398.mp4", + "src": "https://example.org/files/b4dc97b5-6523-4b61-91ae-d14a80ffd398.mp4", "projection": "flat", "autoPlay": true, "controls": true, @@ -36,4 +36,4 @@ module.exports = { }); assert.strictEqual(utils.UUID_REGEX.test(ext['networked']['id']), true); } -}; \ No newline at end of file +};