Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ <h2 class="fullview__item-title">Rome</h2>
</main>
<script src="js/imagesloaded.pkgd.min.js"></script>
<script src="js/three.min.js"></script>
<script src="js/TweenLite.min.js"></script>
<script src="js/CSSPlugin.min.js"></script>
<script src="js/EasePack.min.js"></script>
<script src="js/gsap.min.js"></script>
<script src="js/GridToFullscreenEffect.js"></script>
<script src="js/basicDemo.js"></script>
<script>
Expand Down
4 changes: 1 addition & 3 deletions index2.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ <h2 class="fullview__item-title">Nature</h2>
</main>
<script src="js/imagesloaded.pkgd.min.js"></script>
<script src="js/three.min.js"></script>
<script src="js/TweenLite.min.js"></script>
<script src="js/CSSPlugin.min.js"></script>
<script src="js/EasePack.min.js"></script>
<script src="js/gsap.min.js"></script>
<script src="js/GridToFullscreenEffect.js"></script>
<script src="js/basicDemo.js"></script>
<script>
Expand Down
4 changes: 1 addition & 3 deletions index3.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ <h2 class="fullview__item-title">Tokyo</h2>
</main>
<script src="js/imagesloaded.pkgd.min.js"></script>
<script src="js/three.min.js"></script>
<script src="js/TweenLite.min.js"></script>
<script src="js/CSSPlugin.min.js"></script>
<script src="js/EasePack.min.js"></script>
<script src="js/gsap.min.js"></script>
<script src="js/GridToFullscreenEffect.js"></script>
<script src="js/basicDemo.js"></script>
<script>
Expand Down
4 changes: 1 addition & 3 deletions index4.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ <h2 class="fullview__item-title">Wisma Green</h2>
</main>
<script src="js/imagesloaded.pkgd.min.js"></script>
<script src="js/three.min.js"></script>
<script src="js/TweenLite.min.js"></script>
<script src="js/CSSPlugin.min.js"></script>
<script src="js/EasePack.min.js"></script>
<script src="js/gsap.min.js"></script>
<script src="js/GridToFullscreenEffect.js"></script>
<script src="js/basicDemo.js"></script>
<script>
Expand Down
4 changes: 1 addition & 3 deletions index5.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ <h2 class="fullview__item-title">Jump in</h2>
</main>
<script src="js/imagesloaded.pkgd.min.js"></script>
<script src="js/three.min.js"></script>
<script src="js/TweenLite.min.js"></script>
<script src="js/CSSPlugin.min.js"></script>
<script src="js/EasePack.min.js"></script>
<script src="js/gsap.min.js"></script>
<script src="js/GridToFullscreenEffect.js"></script>
<script src="js/basicDemo.js"></script>
<script>
Expand Down
4 changes: 1 addition & 3 deletions index6.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ <h2 class="fullview__item-title">Inner life</h2>
</main>
<script src="js/imagesloaded.pkgd.min.js"></script>
<script src="js/three.min.js"></script>
<script src="js/TweenLite.min.js"></script>
<script src="js/CSSPlugin.min.js"></script>
<script src="js/EasePack.min.js"></script>
<script src="js/gsap.min.js"></script>
<script src="js/GridToFullscreenEffect.js"></script>
<script src="js/basicDemo.js"></script>
<script>
Expand Down
13 changes: 0 additions & 13 deletions js/CSSPlugin.min.js

This file was deleted.

12 changes: 0 additions & 12 deletions js/EasePack.min.js

This file was deleted.

19 changes: 9 additions & 10 deletions js/GridToFullscreenEffect.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* A grid items to fullscreen transition
* @module GridToFullscreenEffect
* @author Daniel Velasquez
* @version 1.0.0
* @version 1.1.0
*/

class GridToFullscreenEffect {
Expand Down Expand Up @@ -130,18 +130,17 @@ class GridToFullscreenEffect {
const textures = [];
for (let i = 0; i < images.length; i++) {
const imageSet = images[i];
const largeTexture = new THREE.Texture(imageSet.large.image);
const loader = new THREE.TextureLoader();
const largeTexture = loader.load(imageSet.large.image.src);

// So It doesnt get resized to the power of 2
largeTexture.generateMipmaps = false;
largeTexture.wrapS = largeTexture.wrapT = THREE.ClampToEdgeWrapping;
largeTexture.minFilter = THREE.LinearFilter;
largeTexture.needsUpdate = true;
const smallTexture = new THREE.Texture(imageSet.small.image);
const smallTexture = loader.load(imageSet.small.image.src);
smallTexture.generateMipmaps = false;
smallTexture.wrapS = smallTexture.wrapT = THREE.ClampToEdgeWrapping;
smallTexture.minFilter = THREE.LinearFilter;
smallTexture.needsUpdate = true;
const textureSet = {
large: {
element: imageSet.large.element,
Expand Down Expand Up @@ -207,7 +206,7 @@ class GridToFullscreenEffect {
);

const segments = 128;
var geometry = new THREE.PlaneBufferGeometry(1, 1, segments, segments);
var geometry = new THREE.PlaneGeometry(1, 1, segments, segments);
function isFunction(functionToCheck) {
return (
functionToCheck &&
Expand Down Expand Up @@ -263,10 +262,10 @@ class GridToFullscreenEffect {
this.isAnimating = true;
if (this.options.onToGridStart)
this.options.onToGridStart({ index: this.currentImageIndex });
this.tween = TweenLite.to(
this.tween = gsap.to(
this.uniforms.uProgress,
this.options.timing.duration,
{
duration: this.options.timing.duration,
value: 0,
ease: this.options.easings.toGrid,
onUpdate: () => {
Expand Down Expand Up @@ -375,10 +374,10 @@ class GridToFullscreenEffect {
if (this.options.onToFullscreenStart)
this.options.onToFullscreenStart({ index: this.currentImageIndex });

this.tween = TweenLite.to(
this.tween = gsap.to(
this.uniforms.uProgress,
this.options.timing.duration,
{
duration: this.options.timing.duration,
value: 1,
ease: this.options.easings.toFullscreen,
onUpdate: () => {
Expand Down
12 changes: 0 additions & 12 deletions js/TweenLite.min.js

This file was deleted.

10 changes: 10 additions & 0 deletions js/gsap.min.js

Large diffs are not rendered by default.

Loading