Skip to content

Commit 0766c4c

Browse files
authored
Merge pull request #167 from mkeblx/new-branch
Update links to default branch
2 parents 9e7f022 + 148c1f3 commit 0766c4c

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

explainer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ <h3>What's the deal with WebGL?</h3>
6363
<h3>To Framework or not to Framework?</h3>
6464
<p>Most usage of WebGL today happens via frameworks that significantly simplify the creation of 3D scenes compared to using raw WebGL. Some of the more popular examples are <a href="https://threejs.org/">three.js</a>, <a href="https://www.babylonjs.com/">babylon.js</a>, and <a href="https://playcanvas.com/">PlayCanvas</a>. There's also frameworks that are specifically designed to create XR content on the web, such as <a href="https://aframe.io/">A-Frame</a> and <a href="https://github.com/pmndrs/react-xr">ReactXR</a>. These are all <i>fantastic</i> libraries with their own strengths and focuses, and in general it's recommended that you find tools that suit your needs and rely on them rather than trying to build your own rendering systems from scratch.</p>
6565

66-
<p>However, most frameworks will also hide away the details of interacting with the WebXR API. That's generally great for users, but not terribly useful when the entire point of your code is to demonstrate how to use the API! At the same time, we don't want the WebXR logic to be obscured by hundreds of lines of WebGL calls. As a result, these samples make use of their own <a href="https://github.com/immersive-web/webxr-samples/tree/master/js/render">minimalistic rendering library</a> that is specifically designed to highlight use of the WebXR API and de-emphasize the WebGL rendering logic. It is <b>not</b> recommended that you use this library in your own projects, as you will almost certainly be better served by one of the more popular, better established frameworks.</p>
66+
<p>However, most frameworks will also hide away the details of interacting with the WebXR API. That's generally great for users, but not terribly useful when the entire point of your code is to demonstrate how to use the API! At the same time, we don't want the WebXR logic to be obscured by hundreds of lines of WebGL calls. As a result, these samples make use of their own <a href="https://github.com/immersive-web/webxr-samples/tree/main/js/render">minimalistic rendering library</a> that is specifically designed to highlight use of the WebXR API and de-emphasize the WebGL rendering logic. It is <b>not</b> recommended that you use this library in your own projects, as you will almost certainly be better served by one of the more popular, better established frameworks.</p>
6767
</main>
6868

6969
<footer class='footer'>

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ <h2 class='tagline'>Sample Pages</h2>
289289
links.classList.add('links');
290290

291291
let sourceLink = document.createElement('a');
292-
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/master/' + page.path;
292+
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/main/' + page.path;
293293
sourceLink.textContent = 'Source';
294294
links.appendChild(sourceLink);
295295

@@ -309,7 +309,7 @@ <h2 class='tagline'>Sample Pages</h2>
309309

310310
<p>Models used in these samples come from <a href="https://poly.google.com">Poly</a>, and many were modeled in <a href="https://vr.google.com/blocks/">Blocks</a>.<br/>
311311
They are stored and loaded using the <a href="https://www.khronos.org/gltf/">glTF 2.0 format</a>.<br/>
312-
Attribution for individual models can be found under the <a href="https://github.com/immersive-web/webxr-samples/tree/master/media/gltf">media/gltf</a> folders for this repository.</p>
312+
Attribution for individual models can be found under the <a href="https://github.com/immersive-web/webxr-samples/tree/main/media/gltf">media/gltf</a> folders for this repository.</p>
313313

314314
<h3><a class='github-link' href='https://github.com/immersive-web/webxr-samples'>View samples source on GitHub</a></h3>
315315

layers-samples/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ <h2 class='tagline'>WebXR Layers Samples</h2>
233233
links.classList.add('links');
234234

235235
let sourceLink = document.createElement('a');
236-
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/master/layers-samples/' + page.path;
236+
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/main/layers-samples/' + page.path;
237237
sourceLink.textContent = 'Source';
238238
links.appendChild(sourceLink);
239239

proposals/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ <h2 class='tagline'>Proposals</h2>
164164
links.classList.add('links');
165165

166166
let sourceLink = document.createElement('a');
167-
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/master/proposals/' + page.path;
167+
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/main/proposals/' + page.path;
168168
sourceLink.textContent = 'Source';
169169
links.appendChild(sourceLink);
170170

teleportation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
playerInWorldSpaceOld,
270270
trackingSpaceOriginInWorldSpace);
271271

272-
// based on https://github.com/immersive-web/webxr/blob/master/input-explainer.md#targeting-ray-pose
272+
// based on https://github.com/immersive-web/webxr/blob/main/input-explainer.md#targeting-ray-pose
273273
let inputSourcePose = ev.frame.getPose(ev.inputSource.targetRaySpace, refSpace);
274274
if (!inputSourcePose) {
275275
return;

tests/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ <h2 class='tagline'>Test Pages</h2>
190190
links.classList.add('links');
191191

192192
let sourceLink = document.createElement('a');
193-
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/master/tests/' + page.path;
193+
sourceLink.href = 'https://github.com/immersive-web/webxr-samples/blob/main/tests/' + page.path;
194194
sourceLink.textContent = 'Source';
195195
links.appendChild(sourceLink);
196196

0 commit comments

Comments
 (0)