Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
AlbanCrepel committed Mar 21, 2019
2 parents 7d5a385 + 1b0d989 commit 84aa840
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
## Demo

<p align="center">
<p align="center">
<img src="./src/assets/demo.gif" width="400px" height="auto" alt="Demo gif"/>
</p>

Expand All @@ -24,19 +24,19 @@

```vue
<template>
<vue-displacement-slideshow
<vue-displacement-slideshow
:images="images"
displacement="require('../assets/displacement.png')"
:intensity.number="0.2"
:speedIn.number="1.4"
:speedOut.number="1.4"
:intensity="0.2"
:speedIn="1.4"
:speedOut="1.4"
ease="Expo.easeInOut"
ref="slideshow"></vue-displacement-slideshow>
</template>
<script>
import VueDisplacementSlideshow from "vue-displacement-slideshow";
export default {
components: {
VueDisplacementSlideshow,
Expand All @@ -63,7 +63,7 @@
}
};
</script>
```

This component is heavily based on this library :
Expand Down Expand Up @@ -109,7 +109,7 @@ When we call the `previous` method while currently showing the first image, it w

The images are displayed as we would use `background-size:cover` in CSS.

## Contributing
## Contributing

Contributions are welcome !
Follow the instructions in the [contributing file](./CONTRIBUTING.md)
Expand Down
2 changes: 1 addition & 1 deletion src/VueDisplacementSlideshow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
insertImage(path, index = this.textures.length) {
const loader = new TextureLoader();
loader.crossOrigin = '';
return new Promise((resolve, reject) => {
return new Promise((resolve) => {
let texture = loader.load(path, () => {
this.render();
resolve();
Expand Down

0 comments on commit 84aa840

Please sign in to comment.