Skip to content
Permalink
Browse files

Move logo to pg as well

  • Loading branch information...
deltakosh committed Apr 22, 2019
1 parent 1dec5e4 commit 7399ba4ff4d935c26fc609f9a2d53f4e7b338d57
@@ -24,12 +24,27 @@ body {
flex-direction: column;
}

#logo-part {
width: 20vw;
display: grid;
grid-template-rows: 100%;
grid-template-columns: 100%;
}

#waitLogo {
-webkit-animation: spin1 2s infinite ease-in-out;
-moz-animation: spin1 2s infinite ease-in-out;
-o-animation: spin1 2s infinite ease-in-out;
-ms-animation: spin1 2s infinite ease-in-out;
animation: spin1 2s infinite ease-in-out;
grid-column: 1;
grid-row: 1;
margin: 25%;
}

#waitSpinner {
grid-column: 1;
grid-row: 1;
-webkit-animation: spin1 0.5s infinite linear;
-moz-animation: spin1 0.5s infinite linear;
-o-animation: spin1 0.5s infinite linear;
-ms-animation: spin1 0.5s infinite linear;
animation: spin1 0.5s infinite linear;
-webkit-transform-origin: 50% 50%;
-moz-transform-origin: 50% 50%;
-o-transform-origin: 50% 50%;
@@ -60,7 +75,7 @@ body {
#waitTitle {
text-align: center;
font-size: 38px;
color: #15A4FA;
color: #BB464B;
}
.wrapper {
height: calc(100% - 40px - 30px); /* nvabar top and bottom*/
@@ -376,7 +376,8 @@ <h1>Examples</h1>
</div>
<div class="horizontalSeparator"></div>
<input id="filterBar" type="text" placeholder="Filter examples...">
<img id="filterBarClear" src="https://d33wubrfki0l68.cloudfront.net/17ca450bae302631f4857cd8c3992234ec5dd9a7/057f9/img/ui/clear_button.png">
<img id="filterBarClear"
src="https://d33wubrfki0l68.cloudfront.net/17ca450bae302631f4857cd8c3992234ec5dd9a7/057f9/img/ui/clear_button.png">
</div>

<span class="label" id="fpsLabel">FPS</span>
@@ -433,7 +434,10 @@ <h1>Examples</h1>
<BR>
<BR>
</span>
<img src="waitlogo.png" id="waitLogo" />
<div id="logo-part">
<img src="v4.svg" id="waitLogo" />
<img src="spinner.svg" id="waitSpinner" />
</div>
</div>

<script src="https://code.jquery.com/jquery.js"></script>
@@ -454,4 +458,4 @@ <h1>Examples</h1>
</script>
</body>

</html>
</html>
@@ -15,7 +15,8 @@
<link rel="apple-touch-icon" sizes="144x144" href="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="https://www.babylonjs.com/img/favicon/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="https://www.babylonjs.com/img/favicon/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="https://www.babylonjs.com/img/favicon/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="192x192"
href="https://www.babylonjs.com/img/favicon/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="https://www.babylonjs.com/img/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="https://www.babylonjs.com/img/favicon/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="https://www.babylonjs.com/img/favicon/favicon-16x16.png">
@@ -54,7 +55,8 @@

<!-- Extensions -->
<script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js" async></script>
<script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js" async></script>
<script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js"
async></script>

<!-- Scene Manager -->
<script src="https://mackeyk24.github.io/toolkit/babylon.manager.js"></script>
@@ -411,7 +413,8 @@ <h1>Examples</h1>
</div>
<div class="horizontalSeparator"></div>
<input id="filterBar" type="text" placeholder="Filter examples...">
<img id="filterBarClear" src="https://d33wubrfki0l68.cloudfront.net/17ca450bae302631f4857cd8c3992234ec5dd9a7/057f9/img/ui/clear_button.png">
<img id="filterBarClear"
src="https://d33wubrfki0l68.cloudfront.net/17ca450bae302631f4857cd8c3992234ec5dd9a7/057f9/img/ui/clear_button.png">
</div>

<span class="label" id="fpsLabel">FPS</span>
@@ -468,7 +471,10 @@ <h1>Examples</h1>
<BR>
<BR>
</span>
<img src="waitlogo.png" id="waitLogo" />
<div id="logo-part">
<img src="v4.svg" id="waitLogo" />
<img src="spinner.svg" id="waitSpinner" />
</div>
</div>

<script src="js/libs/jquery.min.js"></script>
@@ -626,14 +626,14 @@ function showError(errorMessage, errorEvent) {

if (scene) {
if (showInspector) {
if(scene.then){
if (scene.then) {
// Handle if scene is a promise
scene.then((s)=>{
scene.then((s) => {
if (!s.debugLayer.isVisible()) {
s.debugLayer.show({ embedMode: true });
}
})
}else{
} else {
if (!scene.debugLayer.isVisible()) {
scene.debugLayer.show({ embedMode: true });
}
File renamed without changes.
File renamed without changes.
Binary file not shown.
@@ -35,8 +35,8 @@ export class DefaultLoadingScreen implements ILoadingScreen {
private _loadingDiv: Nullable<HTMLDivElement>;
private _loadingTextDiv: HTMLDivElement;

public static DefaultLogoUrl = "https://assets.babylonjs.com/identity/v4.svg";
public static DefaultSpinnerUrl = "https://assets.babylonjs.com/identity/spinner.svg";
public static DefaultLogoUrl = "";
public static DefaultSpinnerUrl = "";

/**
* Creates a new default loading screen
@@ -100,7 +100,11 @@ export class DefaultLoadingScreen implements ILoadingScreen {

// Loading img
var imgBack = new Image();
imgBack.src = DefaultLoadingScreen.DefaultLogoUrl;
if (!DefaultLoadingScreen.DefaultLogoUrl) {
imgBack.src = `data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxODAuMTcgMjA4LjA0Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2ZmZjt9LmNscy0ye2ZpbGw6I2UwNjg0Yjt9LmNscy0ze2ZpbGw6I2JiNDY0Yjt9LmNscy00e2ZpbGw6I2UwZGVkODt9LmNscy01e2ZpbGw6I2Q1ZDJjYTt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkJhYnlsb25Mb2dvPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iUGFnZV9FbGVtZW50cyIgZGF0YS1uYW1lPSJQYWdlIEVsZW1lbnRzIj48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik05MC4wOSwwLDAsNTJWMTU2bDkwLjA5LDUyLDkwLjA4LTUyVjUyWiIvPjxwb2x5Z29uIGNsYXNzPSJjbHMtMiIgcG9pbnRzPSIxODAuMTcgNTIuMDEgMTUxLjk3IDM1LjczIDEyNC44NSA1MS4zOSAxNTMuMDUgNjcuNjcgMTgwLjE3IDUyLjAxIi8+PHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjI3LjEyIDY3LjY3IDExNy4yMSAxNS42NiA5MC4wOCAwIDAgNTIuMDEgMjcuMTIgNjcuNjciLz48cG9seWdvbiBjbGFzcz0iY2xzLTIiIHBvaW50cz0iNjEuODkgMTIwLjMgOTAuMDggMTM2LjU4IDExOC4yOCAxMjAuMyA5MC4wOCAxMDQuMDIgNjEuODkgMTIwLjMiLz48cG9seWdvbiBjbGFzcz0iY2xzLTMiIHBvaW50cz0iMTUzLjA1IDY3LjY3IDE1My4wNSAxNDAuMzcgOTAuMDggMTc2LjcyIDI3LjEyIDE0MC4zNyAyNy4xMiA2Ny42NyAwIDUyLjAxIDAgMTU2LjAzIDkwLjA4IDIwOC4wNCAxODAuMTcgMTU2LjAzIDE4MC4xNyA1Mi4wMSAxNTMuMDUgNjcuNjciLz48cG9seWdvbiBjbGFzcz0iY2xzLTMiIHBvaW50cz0iOTAuMDggNzEuNDYgNjEuODkgODcuNzQgNjEuODkgMTIwLjMgOTAuMDggMTA0LjAyIDExOC4yOCAxMjAuMyAxMTguMjggODcuNzQgOTAuMDggNzEuNDYiLz48cG9seWdvbiBjbGFzcz0iY2xzLTQiIHBvaW50cz0iMTUzLjA1IDY3LjY3IDExOC4yOCA4Ny43NCAxMTguMjggMTIwLjMgOTAuMDggMTM2LjU4IDkwLjA4IDE3Ni43MiAxNTMuMDUgMTQwLjM3IDE1My4wNSA2Ny42NyIvPjxwb2x5Z29uIGNsYXNzPSJjbHMtNSIgcG9pbnRzPSIyNy4xMiA2Ny42NyA2MS44OSA4Ny43NCA2MS44OSAxMjAuMyA5MC4wOCAxMzYuNTggOTAuMDggMTc2LjcyIDI3LjEyIDE0MC4zNyAyNy4xMiA2Ny42NyIvPjwvZz48L2c+PC9zdmc+`;
} else {
imgBack.src = DefaultLoadingScreen.DefaultLogoUrl;
}

imgBack.style.position = "absolute";
imgBack.style.left = "50%";
@@ -112,7 +116,12 @@ export class DefaultLoadingScreen implements ILoadingScreen {

// Loading spinner
var imgSpinner = new Image();
imgSpinner.src = DefaultLoadingScreen.DefaultSpinnerUrl;

if (!DefaultLoadingScreen.DefaultSpinnerUrl) {
imgSpinner.src = `data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOTIgMzkyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwNjg0Yjt9LmNscy0ye2ZpbGw6bm9uZTt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlNwaW5uZXJJY29uPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iU3Bpbm5lciI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDAuMjEsMTI2LjQzYzMuNy03LjMxLDcuNjctMTQuNDQsMTItMjEuMzJsMy4zNi01LjEsMy41Mi01YzEuMjMtMS42MywyLjQxLTMuMjksMy42NS00LjkxczIuNTMtMy4yMSwzLjgyLTQuNzlBMTg1LjIsMTg1LjIsMCwwLDEsODMuNCw2Ny40M2EyMDgsMjA4LDAsMCwxLDE5LTE1LjY2YzMuMzUtMi40MSw2Ljc0LTQuNzgsMTAuMjUtN3M3LjExLTQuMjgsMTAuNzUtNi4zMmM3LjI5LTQsMTQuNzMtOCwyMi41My0xMS40OSwzLjktMS43Miw3Ljg4LTMuMywxMi00LjY0YTEwNC4yMiwxMDQuMjIsMCwwLDEsMTIuNDQtMy4yMyw2Mi40NCw2Mi40NCwwLDAsMSwxMi43OC0xLjM5QTI1LjkyLDI1LjkyLDAsMCwxLDE5NiwyMS40NGE2LjU1LDYuNTUsMCwwLDEsMi4wNSw5LDYuNjYsNi42NiwwLDAsMS0xLjY0LDEuNzhsLS40MS4yOWEyMi4wNywyMi4wNywwLDAsMS01Ljc4LDMsMzAuNDIsMzAuNDIsMCwwLDEtNS42NywxLjYyLDM3LjgyLDM3LjgyLDAsMCwxLTUuNjkuNzFjLTEsMC0xLjkuMTgtMi44NS4yNmwtMi44NS4yNHEtNS43Mi41MS0xMS40OCwxLjFjLTMuODQuNC03LjcxLjgyLTExLjU4LDEuNGExMTIuMzQsMTEyLjM0LDAsMCwwLTIyLjk0LDUuNjFjLTMuNzIsMS4zNS03LjM0LDMtMTAuOTQsNC42NHMtNy4xNCwzLjUxLTEwLjYsNS41MUExNTEuNiwxNTEuNiwwLDAsMCw2OC41Niw4N0M2Ny4yMyw4OC40OCw2Niw5MCw2NC42NCw5MS41NnMtMi41MSwzLjE1LTMuNzUsNC43M2wtMy41NCw0LjljLTEuMTMsMS42Ni0yLjIzLDMuMzUtMy4zMyw1YTEyNywxMjcsMCwwLDAtMTAuOTMsMjEuNDksMS41OCwxLjU4LDAsMSwxLTMtMS4xNVM0MC4xOSwxMjYuNDcsNDAuMjEsMTI2LjQzWiIvPjxyZWN0IGNsYXNzPSJjbHMtMiIgd2lkdGg9IjM5MiIgaGVpZ2h0PSIzOTIiLz48L2c+PC9nPjwvc3ZnPg==`;
} else {
imgSpinner.src = DefaultLoadingScreen.DefaultSpinnerUrl;
}

imgSpinner.style.position = "absolute";
imgSpinner.style.left = "50%";

0 comments on commit 7399ba4

Please sign in to comment.
You can’t perform that action at this time.