Skip to content

Commit

Permalink
Merge pull request #305 from Exairnous/mozilla-branding-removal-1
Browse files Browse the repository at this point in the history
[Mozilla Branding Removal] Remove branding references, URLs, images, etc.
  • Loading branch information
Exairnous authored Jul 26, 2024
2 parents 08ffc89 + 613289a commit 3e33216
Show file tree
Hide file tree
Showing 25 changed files with 31 additions and 31 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<img alt="select add-on zip file" src="https://user-images.githubusercontent.com/837184/204576860-316b32de-8654-48a7-b9a7-3c0de1c1b652.png" width=685px height=330px />

Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions addons/io_hubs_addon/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion addons/io_hubs_addon/components/definitions/audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion addons/io_hubs_addon/components/definitions/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion addons/io_hubs_addon/components/definitions/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/io_hubs_addon/components/definitions/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion addons/io_hubs_addon/components/definitions/pdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion addons/io_hubs_addon/components/definitions/spawner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion addons/io_hubs_addon/components/definitions/video.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions addons/io_hubs_addon/nodes/lightmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -63,14 +63,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)


Expand Down
Binary file modified tests/scenes/audio.blend
Binary file not shown.
Binary file modified tests/scenes/environment-settings.blend
Binary file not shown.
Binary file modified tests/scenes/image.blend
Binary file not shown.
Binary file modified tests/scenes/link.blend
Binary file not shown.
Binary file modified tests/scenes/model.blend
Binary file not shown.
Binary file modified tests/scenes/pdf.blend
Binary file not shown.
Binary file modified tests/scenes/spawner.blend
Binary file not shown.
Binary file modified tests/scenes/video.blend
Binary file not shown.
4 changes: 2 additions & 2 deletions tests/test/tests/audio.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,4 +35,4 @@ module.exports = {
});
assert.strictEqual(utils.UUID_REGEX.test(ext['networked']['id']), true);
}
};
};
2 changes: 1 addition & 1 deletion tests/test/tests/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tests/test/tests/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
};
};
4 changes: 2 additions & 2 deletions tests/test/tests/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
};
};
4 changes: 2 additions & 2 deletions tests/test/tests/spawner.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
});
}
};
};
4 changes: 2 additions & 2 deletions tests/test/tests/video.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -36,4 +36,4 @@ module.exports = {
});
assert.strictEqual(utils.UUID_REGEX.test(ext['networked']['id']), true);
}
};
};

0 comments on commit 3e33216

Please sign in to comment.