Skip to content

Commit 79fc37f

Browse files
authored
Merge pull request #191 from Hubs-Foundation/mozilla-branding-removal
[Mozilla Branding Removal] First pass.
2 parents b447de7 + eddcb68 commit 79fc37f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+300
-203
lines changed

docs/creators-advanced-avatar-customization.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ As described in the [creating custom avatars](intro-avatars.html) page, the most
99

1010
For more advanced customization, you can use the following resources:
1111

12-
* [Photoshop PSD Templates](https://github.com/MozillaReality/hubs-avatar-pipelines/blob/master/Photoshop) - Photoshop templates for a custom Hubs base color skin. You can also use Photoshop's 3D painting tools, using the [Robot OBJ/MAT file](https://github.com/j-conrad/hubs-avatar-pipelines/tree/master/Other%20model%20formats).
13-
* [Substance Painter Project](https://github.com/MozillaReality/hubs-avatar-pipelines/blob/master/Substance)- Full Substance Painter projects for advanced custom skinning. You can also download and modify any of our example texture sets.
12+
* [Photoshop PSD Templates](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Photoshop) - Photoshop templates for a custom Hubs base color skin. You can also use Photoshop's 3D painting tools, using the [Robot OBJ/MAT file](https://github.com/j-conrad/hubs-avatar-pipelines/tree/master/Other%20model%20formats).
13+
* [Substance Painter Project](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/blob/master/Substance)- Full Substance Painter projects for advanced custom skinning. You can also download and modify any of our example texture sets.
1414

1515
![UV Layout example](img/UVLayout.jpg)
1616

@@ -48,17 +48,17 @@ You can follow along with Jim and Dom in this recorded live stream here to walk
4848

4949
We offer the following resources if you'd like to modify our base Robot avatar:
5050

51-
* [Blender Source Files](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) are available of our Robot avatar. **For specific information about how to use these .blend files, be sure to check out the readme within the [Blender/AvatarBot](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) folder.**
51+
* [Blender Source Files](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) are available of our Robot avatar. **For specific information about how to use these .blend files, be sure to check out the readme within the [Blender/AvatarBot](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) folder.**
5252

53-
* [Exported GLBs](Exported%20GLB%20models)/[Exported OBJ](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Other%20model%20formats) are available if you'd like to bring them into your editor of choice.
53+
* [Exported GLBs](Exported%20GLB%20models)/[Exported OBJ](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Other%20model%20formats) are available if you'd like to bring them into your editor of choice.
5454

5555
We recommend using [Blender 2.83](https://builder.blender.org/download/) (or whatever the most recent release is) for custom models since we have provided example files that you may use as a guide. (Typically, skeleton setup varies between modeling appications which can make importing/exporting skeletons a bit tricky due to unexpected changes in bone rotations, but it is still possible to use something other than Blender.) Note: the .blend files were created with [Blender 2.8](https://builder.blender.org/download/) due to the built-in glTF exporter. The glTF importer/exporter for Blender is currently in development. Expect some bugs and [please report them!](https://github.com/KhronosGroup/glTF-Blender-IO/issues)
5656

5757
Hubs avatars are meant for VR, which means that you should work in real world units. A typical avatar height is roughly 1.7 meters. Note: This is typically a 'standing height'. The lack of legs shown here is a part of that overall height.
5858

5959
![avatar height diagram](img/avatarHeight.jpg)
6060

61-
Files with the suffix *_base* refer to the most barebones, basic robot avatar template that can be used as a reference when creating new avatar models. Typically, the Blender workflow would be to either 'Link' or 'Append' the objects from [AvatarBot_base_for_export.blend](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) in order to use the existing armature (skeleton) and any animations that go along with it, using them as a basis for your own model that you would attach to it.
61+
Files with the suffix *_base* refer to the most barebones, basic robot avatar template that can be used as a reference when creating new avatar models. Typically, the Blender workflow would be to either 'Link' or 'Append' the objects from [AvatarBot_base_for_export.blend](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) in order to use the existing armature (skeleton) and any animations that go along with it, using them as a basis for your own model that you would attach to it.
6262

6363
The armature is based largely upon the same hierarchy and naming conventions of the skeleton provided by [High Fidelity](https://docs.highfidelity.com/en/rc80/create/avatars/avatar-standards.html#skeleton). This also happens to have a similar structure to VRChat in terms of bone orientations.
6464
However, in our current implementation in Hubs, we have eliminated some of the bones within the hierarchy, namely the lower body and arm joints since we are not using any sort of inverse kinematics (IK) at the moment. This may change in future iterations.

docs/creators-blender-components.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ The second option is called ‘**Increment**’ and lets you specify the number
3939
![UV Scroll Example 2](img/components_UVscroll_02.gif)
4040
- The same scroll speed as above with an increment value of 0.1.
4141

42-
We can take advantage of this effect by using long strips of animations in a sort of virtual flip-book, allowing the playback of things such as blinking lights, all the way to full-blown GIF animations. For additional information about advanced uses of the ‘UV Scroll’ component, see Jim’s excellent Creator Labs write-up [HERE](https://hubs.mozilla.com/labs/animating-textures-with-the-uv-scroll-component-pt1/).
42+
We can take advantage of this effect by using long strips of animations in a sort of virtual flip-book, allowing the playback of things such as blinking lights, all the way to full-blown GIF animations.
43+
44+
<!-- For additional information about advanced uses of the ‘UV Scroll’ component, see Jim’s excellent Creator Labs write-up [HERE](https://hubs.mozilla.com/labs/animating-textures-with-the-uv-scroll-component-pt1/). -->
4345

4446

4547
## Avatar
@@ -110,7 +112,7 @@ To make a media frame, create an ‘Empty’ in your Blender scene. Since media
110112

111113
The ‘**Media Type**’ dropdown will let you specify which type of media your frame will accept. This can be limited to only 2D media, specific types of 2D media, 3D models, or any type of media.
112114

113-
For more information about the ‘Media Frame’ component, see Laurie ONeill’s article on Creator Labs [HERE](https://hubs.mozilla.com/labs/working-with-media-frames/).
115+
<!-- For more information about the ‘Media Frame’ component, see Laurie ONeill’s article on Creator Labs [HERE](https://hubs.mozilla.com/labs/working-with-media-frames/). -->
114116

115117

116118
### Particle Emitter
@@ -399,7 +401,7 @@ Adding an ‘Audio Target’ component to an empty will also automatically add a
399401

400402
An ‘Audio Zone’ is a special volume in your Hubs scene inside which you can override audio settings. It is useful for creating private spaces in your scene outside of which audio cannot be heard from within the defined volume. Audio zones affect both spoken audio as well as media audio that are within the audio zone.
401403

402-
For more information about the ‘Audio Zone’ component and how it works, see [Matt’s article on Creator Labs](https://hubs.mozilla.com/labs/creating-speaker-stages-and-manipulating-audio-in-hubs/).
404+
<!-- For more information about the ‘Audio Zone’ component and how it works, see [Matt’s article on Creator Labs](https://hubs.mozilla.com/labs/creating-speaker-stages-and-manipulating-audio-in-hubs/). -->
403405

404406
### Image
405407

@@ -578,7 +580,7 @@ The Audio Settings options are:
578580

579581
**Media Cone Outer Gain**: A double value describing the amount of volume reduction outside the cone defined by the ‘Media Cone Outer Gain’ attribute. Its default value is 0, meaning that no sound can be heard.
580582

581-
If you’d like an example of what some sound combinations can sound like, head on over to [THIS](https://hubs.mozilla.com/scenes/hitpNgs) super handy Hubs scene that has a number of videos, each with different ‘Audio Params’ overrides that you can listen to while you walk around so you can get an idea how the settings affect the volume as you move around the scene.
583+
<!-- If you’d like an example of what some sound combinations can sound like, head on over to [THIS](https://hubs.mozilla.com/scenes/hitpNgs) super handy Hubs scene that has a number of videos, each with different ‘Audio Params’ overrides that you can listen to while you walk around so you can get an idea how the settings affect the volume as you move around the scene. -->
582584

583585
### Environment Settings
584586

@@ -646,7 +648,9 @@ Contrary to popular assumption, Hubs avatars do not navigate the 3D scene using
646648
![Navigation Mesh Example 1](img/components_navigationMesh_01.png)
647649
- A sample Hubs scene with a ‘Navigation Mesh’ (shown in green).
648650

649-
The ‘Navigation Mesh’ component gets attached to a duplicated section of floor that has areas cut out for walls and other scene objects that you don’t want avatars to be able to walk through. Navigation meshes must be one mesh object (you cannot have multiple nav meshes in a scene) and all vertices must be welded together so that there are no discontinuous pieces. It’s generally a good idea to also attach a ‘Visible’ component to your nav mesh with its visibility toggled off (unchecked). For more information about making custom nav meshes for your scene, check out Jim’s comprehensive article on Creator Labs [HERE](https://hubs.mozilla.com/labs/what-is-a-nav-mesh/).
651+
The ‘Navigation Mesh’ component gets attached to a duplicated section of floor that has areas cut out for walls and other scene objects that you don’t want avatars to be able to walk through. Navigation meshes must be one mesh object (you cannot have multiple nav meshes in a scene) and all vertices must be welded together so that there are no discontinuous pieces. It’s generally a good idea to also attach a ‘Visible’ component to your nav mesh with its visibility toggled off (unchecked).
652+
653+
<!-- For more information about making custom nav meshes for your scene, check out Jim’s comprehensive article on Creator Labs [HERE](https://hubs.mozilla.com/labs/what-is-a-nav-mesh/). -->
650654

651655
### Reflection Probes
652656

@@ -655,5 +659,5 @@ The ‘Reflection Probe’ element is used to create areas in your scene inside
655659
![Reflection Probe Example 1](img/components_reflectionProbe_01.png)
656660
- The ‘Reflection Probe’ component and its settings.
657661

658-
For more information about the ‘Reflection Probe’ element, see [Jim’s excellent article on Creator Labs](https://hubs.mozilla.com/labs/baked-lighting-for-better-looking-hubs-scenes/) titled “Baked Lighting for Better-Looking Hubs Scenes”.
662+
<!-- For more information about the ‘Reflection Probe’ element, see [Jim’s excellent article on Creator Labs](https://hubs.mozilla.com/labs/baked-lighting-for-better-looking-hubs-scenes/) titled “Baked Lighting for Better-Looking Hubs Scenes”. -->
659663

docs/creators-linking-rooms.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ It is possible to link Hubs rooms together using Spoke, or from directly in Hubs
88

99
The first thing that you want to do is create your rooms. While you have the ability to create rooms directly from a scene URL, this will generate a new room each time. In order to link multiple rooms together, we recommend generating the rooms first, then updating the rooms to use a scene that contains links to the other room.
1010

11-
1. Go to [https://hubs.mozilla.com/](https://hubs.mozilla.com/) and use the 'Create Room' button to create a new room. You can use the 'Favorite' button to keep the room pinned to your home page to find it easily, or copy the link somewhere.
12-
2. Do this for each room that you want to have available
11+
<!-- 1. Go to [https://hubs.mozilla.com/](https://hubs.mozilla.com/) and use the 'Create Room' button to create a new room. You can use the 'Favorite' button to keep the room pinned to your home page to find it easily, or copy the link somewhere.
12+
2. Do this for each room that you want to have available -->
1313

1414
## Option 1: Linking rooms from inside Hubs
1515
It is possible to link rooms together directly from inside of another Hubs room without having to create new scenes. To do this:

docs/dev-client-basics.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ and [`WebAudio`](https://developer.mozilla.org/en-US/docs/Web/API/Web_Audio_API)
3636
The `Media Capture and Streams API` allows microphones, cameras, and
3737
screencapture to be accessed within the browser. Data is captured and encoded
3838
locally before being sent (as `WebRTC` streams) to a backend service
39-
([`Dialog`](https://github.com/mozilla/dialog)), where they are forwarded to
39+
([`Dialog`](https://github.com/Hubs-Foundation/dialog)), where they are forwarded to
4040
other clients connected to the same room. Incoming streams are decoded and
4141
transformed (e.g. by `PannerNode` s and `GainNodes` from the `WebAudio` API)
4242
before being played through the user&rsquo;s speakers.
4343
- [`HTTP`](https://developer.mozilla.org/en-US/docs/Web/HTTP),
4444
[`Web Sockets`](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) :
4545
The Hubs client is web app, which means its code is downloaded when you visit a
4646
hubs-powered site. After its initial load, the hubs client exchanges many, many
47-
messages to the backend web server, [`Reticulum`](https://github.com/mozilla/reticulum).
47+
messages to the backend web server, [`Reticulum`](https://github.com/Hubs-Foundation/reticulum).
4848
To download assets like 3D model files and 2D images, the client makes `HTTP`
4949
requests. To exchange game state information like, &ldquo;where my avatar is
5050
moving&rdquo;, the client sends messages over a `Web Socket` connection
@@ -63,15 +63,15 @@ usually written in typescript.
6363

6464
There are three main sections of application code:
6565

66-
The [`admin`](https://github.com/mozilla/hubs/tree/master/admin) directory
66+
The [`admin`](https://github.com/Hubs-Foundation/hubs/tree/master/admin) directory
6767
contains a separate application that powers the Hubs admin panel. Note that
6868
this directory will likely undergo changes in the near future.
6969

70-
The [`react-components`](https://github.com/mozilla/hubs/tree/master/src/react-components)
70+
The [`react-components`](https://github.com/Hubs-Foundation/hubs/tree/master/src/react-components)
7171
directory contains all of the 2D UI shown in menus, modals, and toolbars
7272
throughout the client. It is built with [`React`](https://react.dev/).
7373

74-
The [`src`](https://github.com/mozilla/hubs/tree/master/src) directory contains
74+
The [`src`](https://github.com/Hubs-Foundation/hubs/tree/master/src) directory contains
7575
of the code that powers the 3D simulation. The entry points for various pages
7676
are defined in `webpack.config.js`.
7777

docs/dev-client-gameplay.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ hundreds more from the community.
3535

3636
Originally built with `A-Frame`, Hubs switched to `bitECS` and using `Three.js`
3737
directly. Motivation, goals, and non-goals about the transition can be found
38-
in this PR from June, 2022. [#5536](https://github.com/mozilla/hubs/pull/5536)
38+
in this PR from June, 2022. [#5536](https://github.com/Hubs-Foundation/hubs/pull/5536)
3939

4040
TODO: Write the scope in this document based on that PR
4141

@@ -114,8 +114,8 @@ TODO: Add APIs to register custom add-ons.
114114
### Directories
115115

116116
Most of the built-in add-on source codes are found in
117-
[`src/components`](https://github.com/mozilla/hubs/tree/master/src/components) and
118-
[`src/bit-systems`](https://github.com/mozilla/hubs/tree/master/src/bit-systems).
117+
[`src/components`](https://github.com/Hubs-Foundation/hubs/tree/master/src/components) and
118+
[`src/bit-systems`](https://github.com/Hubs-Foundation/hubs/tree/master/src/bit-systems).
119119
Also find the files imported from them. If you want to read the built-in add-on
120120
code check the directories.
121121

@@ -754,7 +754,7 @@ consistency unless any strong reasons.
754754

755755
### HubsWorld
756756

757-
`HubsWorld` defined in [`src/app.ts`](https://github.com/mozilla/hubs/blob/master/src/app.ts)
757+
`HubsWorld` defined in [`src/app.ts`](https://github.com/Hubs-Foundation/hubs/blob/master/src/app.ts)
758758
extends [`bitECS World`](https://github.com/NateTheGreatt/bitECS/blob/master/docs/INTRO.md#-world).
759759
It manages some extra Hubs Client specific resources and also provides some
760760
useful data. For example you can get elapsed and delta time from it.
@@ -772,7 +772,7 @@ associated `Object3D` is allowed.)
772772
TODO: Write the benefit from this limitation
773773

774774
You need to call `addObject3DComponent()` defined in
775-
[`src/utils/jsx-entity.ts`](https://github.com/mozilla/hubs/blob/master/src/utils/jsx-entity.ts)
775+
[`src/utils/jsx-entity.ts`](https://github.com/Hubs-Foundation/hubs/blob/master/src/utils/jsx-entity.ts)
776776
to associate an `Object3D` with an entity.
777777

778778
```typescript
@@ -799,7 +799,7 @@ addObject3DComponent(world, eid, new Group());
799799
```
800800

801801
`addObject3DComponent()` adds the built-in component `Object3DTag` defined in
802-
[`src/bit-components.js`](https://github.com/mozilla/hubs/blob/master/src/bit-components.js)
802+
[`src/bit-components.js`](https://github.com/Hubs-Foundation/hubs/blob/master/src/bit-components.js)
803803
to an entity and stores an `Object3D` in the special `eid2obj` map managed in
804804
`HubsWorld`.
805805

@@ -941,7 +941,7 @@ hand and to version control.
941941

942942
### renderAsEntity()
943943

944-
Our `renderAsEntity()` function defined in [`src/utils/jsx-entity.js`](https://github.com/mozilla/hubs/blob/master/src/utils/jsx-entity.ts)
944+
Our `renderAsEntity()` function defined in [`src/utils/jsx-entity.js`](https://github.com/Hubs-Foundation/hubs/blob/master/src/utils/jsx-entity.ts)
945945
parses `EntityDef`, adds entities to the world, and assign components to the
946946
entities.
947947

@@ -1102,10 +1102,10 @@ as Hubs bitECS component definition.
11021102

11031103
### Hubs Blender add-on and Spoke
11041104

1105-
[`Hubs Blender add-on`](https://github.com/MozillaReality/hubs-blender-exporter)
1105+
[`Hubs Blender add-on`](https://github.com/Hubs-Foundation/hubs-blender-exporter)
11061106
can export `glTF` file with Hubs bitECS component data.
11071107

1108-
[Our online authoring tool Spoke](https://hubs.mozilla.com/spoke/) also
1108+
[Our online authoring tool Spoke](https://github.com/Hubs-Foundation/Spoke) also
11091109
includes component data in the gltf files that it exports and uploads.
11101110

11111111

0 commit comments

Comments
 (0)