Skip to content

Commit

Permalink
Merge pull request #1849 from BabylonJS/deprecateRemove
Browse files Browse the repository at this point in the history 
Remove deprecated stuff
  • Loading branch information
@deltakosh
deltakosh committed Mar 9, 2017
2 parents 9586a86 + 0b143cc commit 49f57f5
Show file tree
Hide file tree
Showing 21 changed files with 1,217 additions and 1,641 deletions.
10 changes: 10 additions & 0 deletions Playground/index.html
View file
Expand Up @@ -76,6 +76,16 @@
<li><a href="#" onclick="setFontSize(22);">22</a></li>
</ul>
</div>
<div class="btn-group desktopOnly">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<span id="currentVersion">Version: Latest</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" id="versionList">
<li><a href="#" onclick="setVersion('latest');">Latest</a></li>
<li><a href="#" onclick="setVersion('2.5');">2.5</a></li>
</ul>
</div>
<div class="btn-group">
<label class="btn btn-sm active">
<input type="checkbox" autocomplete="off" id='safemodeToggle' style="margin-top:-0.1em;margin-right:4px">Safe Mode
Expand Down
23 changes: 23 additions & 0 deletions Playground/index.js
View file
Expand Up @@ -23,6 +23,17 @@
var scripts;
var zipCode;
BABYLON.Engine.ShadersRepository = "/src/Shaders/";

switch (BABYLON.Engine.Version) {
case "2.5":
document.getElementById("currentVersion").innerHTML = "Version: " + BABYLON.Engine.Version;
break;
default:
document.getElementById("currentVersion").innerHTML = "Version: Latest";
break;
}


var loadScript = function (scriptURL, title) {
var xhr = new XMLHttpRequest();

Expand Down Expand Up @@ -400,6 +411,18 @@
});
}

// Versions
setVersion = function (version) {
switch (version) {
case "2.5":
location.href = "index2_5.html";
break;
default:
location.href = "index.html";
break;
}
}

// Fonts
setFontSize = function (size) {
document.querySelector(".monaco-editor").style.fontSize = size + "px";
Expand Down
140 changes: 140 additions & 0 deletions Playground/index2_5.html
View file
@@ -0,0 +1,140 @@
<!DOCTYPE html>
<html>
<head>
<title>Babylon.js Playground</title>
<script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/poly2tri.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.6.2/dat.gui.min.js"></script>
<!--x-tag-->
<script src="xtag.min.js"></script>
<script src="splitbox.js"></script>
<link href="splitbox.css" rel="stylesheet" />
<!-- jszip -->
<script src="jszip.min.js"></script>
<script src="fileSaver.js"></script>
<!-- Bootstrap -->
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script src="node_modules/monaco-editor/min/vs/loader.js"></script>
<!-- Babylon.js -->
<script src="https://babylonjs.azurewebsites.net/cannon.js"></script>
<script src="https://babylonjs.azurewebsites.net/Oimo.js"></script>
<!--<script src="../babylon.js"></script>-->
<script src="https://babylonjs.azurewebsites.net/versions/babylon.2.5.js"></script>
<script src="https://babylonjs.azurewebsites.net/versions/babylon.2.5.canvas2d.js"></script>
<script src="https://babylonjs.azurewebsites.net/babylon.inspector.bundle.js"></script>

<script src="https://babylonjs.azurewebsites.net/lib/babylon.fireMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.waterMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.lavaMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.normalMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.skyMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.triPlanarMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.terrainMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.gradientMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.furMaterial.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.gridMaterial.min.js"></script>

<script src="https://babylonjs.azurewebsites.net/lib/babylon.brickProceduralTexture.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.cloudProceduralTexture.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.fireProceduralTexture.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.grassProceduralTexture.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.marbleProceduralTexture.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.roadProceduralTexture.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.starfieldProceduralTexture.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.woodProceduralTexture.min.js"></script>

<script src="https://babylonjs.azurewebsites.net/lib/babylon.asciiArtPostProcess.min.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.digitalRainPostProcess.min.js"></script>

<script src="https://babylonjs.azurewebsites.net/lib/babylon.glTFFileLoader.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.objFileLoader.js"></script>
<script src="https://babylonjs.azurewebsites.net/lib/babylon.stlFileLoader.js"></script>
<link href="index.css" rel="stylesheet" />
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner" id="topbar">
<a class="brand largeOnly" href="#" id="mainTitle">Babylon.js Playground</a>
<div class="btn-group">
<button class="btn" id="runButton">Run</button>
<button class="btn" id="saveButton">Save</button>
<button class="btn desktopOnly" id="zipButton">Get .zip</button>
<button class="btn desktopOnly" id="newButton">New</button>
<button class="btn desktopOnly" id="clearButton">Clear</button>
</div>
<div class="btn-group desktopOnly">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<span id="currentFontSize">Font: 12</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" id="sizeList">
<li><a href="#" onclick="setFontSize(12);">12</a></li>
<li><a href="#" onclick="setFontSize(14);">14</a></li>
<li><a href="#" onclick="setFontSize(16);">16</a></li>
<li><a href="#" onclick="setFontSize(18);">18</a></li>
<li><a href="#" onclick="setFontSize(20);">20</a></li>
<li><a href="#" onclick="setFontSize(22);">22</a></li>
</ul>
</div>
<div class="btn-group desktopOnly">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<span id="currentVersion">Version: Latest</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" id="versionList">
<li><a href="#" onclick="setVersion('latest');">Latest</a></li>
<li><a href="#" onclick="setVersion('2.5');">2.5</a></li>
</ul>
</div>
<div class="btn-group">
<label class="btn btn-sm active">
<input type="checkbox" autocomplete="off" id='safemodeToggle' style="margin-top:-0.1em;margin-right:4px">Safe Mode
</label>
<button class="btn btn-sm" id="editorButton">-Editor</button>
<button class="btn btn-sm" id="debugButton">+Debug layer</button>
</div>
<div class="btn-group pull-right">
<button class="btn" id="fullscreenButton">Fullscreen</button>
</div>
<div class="btn-group pull-right">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<span id="currentScript">Predefined scripts</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" id="scriptsList"></ul>
</div>
</div>
</div>

<x-splitbox>
<div id="jsEditor"></div>
<div splitter></div>
<div id="canvasZone">
<canvas touch-action="none" id="renderCanvas"></canvas>
</div>
</x-splitbox>

<span class="label" id="fpsLabel">FPS</span>

<div id="errorZone">
</div>

<div class="navbar navbar-inverse navbar-fixed-bottom">
<div class="navbar-inner">
<ul class="nav pull-left">
<li id="statusBar"></li>
</ul>
<ul class="nav pull-right">
<li><a href="http://www.html5gamedevs.com/forum/16-babylonjs/">Forum</a></li>
<li><a href="https://babylonjs.azurewebsites.net/sandbox">Sandbox</a></li>
<li><a href="https://github.com/BabylonJS/Babylon.js/wiki">Wiki</a></li>
<li><a href="https://doc.babylonjs.com">Documentation</a></li>
</ul>
</div>
</div>

<script src="https://code.jquery.com/jquery.js"></script>
<script src="bootstrap/js/bootstrap.min.js"></script>
<script src="index.js"></script>
</body>
</html>
1 change: 0 additions & 1 deletion canvas2D/src/Engine/babylon.sprite2d.ts
View file
Expand Up @@ -268,7 +268,6 @@
* - origin: define the normalized origin point location, default [0.5;0.5]
* - spriteSize: the size of the sprite (in pixels) as it is stored in the texture, if null the size of the given texture will be used, default is null.
* - spriteLocation: the location (in pixels) in the texture of the top/left corner of the Sprite to display, default is null (0,0)
* - spriteScaleFactor: DEPRECATED. Old behavior: say you want to display a sprite twice as big as its bitmap which is 64,64, you set the spriteSize to 128,128 and have to set the spriteScaleFactory to 0.5,0.5 in order to address only the 64,64 pixels of the bitmaps. Default is 1,1.
* - scale9: draw the sprite as a Scale9 sprite, see http://yannickloriot.com/2013/03/9-patch-technique-in-cocos2d/ for more info. x, y, w, z are left, bottom, right, top coordinate of the resizable box
* - invertY: if true the texture Y will be inverted, default is false.
* - isVisible: true if the sprite must be visible, false for hidden. Default is true.
Expand Down
40 changes: 20 additions & 20 deletions dist/preview release/babylon.core.js
View file

Large diffs are not rendered by default.

0 comments on commit 49f57f5

Please sign in to comment.