Skip to content

Commit 612a334

Browse files
Fixed distribution version to have PIXI baked in
1 parent f57db2b commit 612a334

11 files changed

+27521
-59
lines changed

demo/advanced-content-webgl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ <h1>SLIDER BELOW IS RENDERED IN WEBGL, DRAG IT</h1>
172172
</html-gl>
173173
</section>
174174
</div>
175-
<script src="../bower_components/promise-polyfill/Promise.min.js"></script>
175+
<script src="../dist/htmlgl.js"></script>
176176
<script src="../bower_components/webcomponents.js/CustomElements.min.js"></script>
177177
<script src="./js/vendor/velocity.js"></script>
178178
<script src="./js/vendor/html2canvas.js"></script>

demo/basic-webgl.html

+1-10
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,7 @@ <h2>
1818
<ul>
1919
<li>Add more effects presets</li>
2020
</ul>
21-
<script src="../bower_components/promise-polyfill/Promise.min.js"></script>
22-
<script src="../bower_components/webcomponents.js/CustomElements.min.js"></script>
23-
<script src="./js/vendor/velocity.js"></script>
24-
<script src="./js/vendor/html2canvas.js"></script>
25-
<script src="../bower_components/pixi/bin/pixi.js"></script>
26-
<script src="../src/util.js"></script>
27-
<script src="../src/gl-element-resolver.js"></script>
28-
<script src="../src/gl-context.js"></script>
29-
<script src="../src/images-loaded.js"></script>
30-
<script src="../src/gl-element.js"></script>
21+
<script src="../dist/htmlgl.js"></script>
3122
<script>
3223
window.changeNodeContent = function () {
3324
document.getElementsByTagName('html-gl')[0].textContent = 'Animation was smooth, was not it? This is a new content. It is still visible in dev tools, affects HTML layout and is rendered via WebGL.';

demo/nested-content-webgl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ <h1>SLIDER BELOW IS RENDERED IN WEBGL, DRAG IT</h1>
179179
<script src="../bower_components/webcomponents.js/CustomElements.min.js"></script>
180180
<script src="./js/vendor/velocity.js"></script>
181181
<script src="./js/vendor/html2canvas.js"></script>
182-
<script src="../bower_components/pixi/bin/pixi.dev.js"></script>
182+
<script src="../bower_components/pixi/bin/pixi.js"></script>
183183
<script src="../src/util.js"></script>
184184
<script src="../src/gl-element-resolver.js"></script>
185185
<script src="../src/gl-context.js"></script>

dist/htmlgl-effects.js

100644100755
File mode changed.

dist/htmlgl-effects.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/htmlgl.js

+27,488-13
Large diffs are not rendered by default.

dist/htmlgl.min.js

+13-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var BUNDLE_NAME = 'htmlgl',
55

66
gulp.task('default', function () {
77
//Main library
8-
gulp.src(['bower_components/promise-polyfill/Promise.min.js', 'bower_components/webcomponents.js/CustomElements.min.js', 'bower_components/pixi/bin/pixi.min.js', 'demo/js/vendor/html2canvas.js', 'demo/js/vendor/velocity.js', 'src/util.js', 'src/gl-element-resolver.js', 'src/gl-context.js', 'src/images-loaded.js', 'src/gl-element.js'])
8+
gulp.src(['bower_components/promise-polyfill/Promise.min.js', 'bower_components/webcomponents.js/CustomElements.min.js', 'bower_components/pixi/bin/pixi.js', 'demo/js/vendor/html2canvas.js', 'demo/js/vendor/velocity.js', 'src/util.js', 'src/gl-element-resolver.js', 'src/gl-context.js', 'src/images-loaded.js', 'src/gl-element.js'])
99
.pipe(concat(BUNDLE_NAME + '.js'))
1010
.pipe(gulp.dest('dist'))
1111
.pipe(uglify(BUNDLE_NAME + '.min.js'))

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "html-gl",
3-
"version": "0.3.1",
3+
"version": "0.3.2",
44
"description": "Get as many FPS as you need by rendering HTML/CSS in WebGL",
55
"main": "index.js",
66
"scripts": {

page/js/htmlgl.min.js

+13-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/gl-context.js

-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@
8989
self.renderer.view.style.webkitTransform = 'scaleX(' + rendererScale + ') scaleY(' + rendererScale + ')';
9090
self.renderer.resize(width, height);
9191

92-
this.enable();
93-
9492
w.HTMLGL.renderer.render(w.HTMLGL.stage);
9593
});
9694
} else {

0 commit comments

Comments
 (0)