Skip to content

Commit

Permalink
Merge pull request #1 from cemkod/master
Browse files Browse the repository at this point in the history
Convert example textures to POT (Issue: #300)
  • Loading branch information
cemkod committed Dec 19, 2015
2 parents bed32fa + 173cfcb commit 0ed5088
Show file tree
Hide file tree
Showing 28 changed files with 6 additions and 6 deletions.
Binary file modified examples/_images/mozvr.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/_images/webvr.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/_models/tree2/tex/shadow-circle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/_skies/gray-gradient-1.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/_skies/peach-gradient-1.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/animation-generic-logo/index.html
Expand Up @@ -43,7 +43,7 @@
</a-cylinder>
</a-entity>

<a-image id="webvr" src="../_images/webvr.png" width="1" height="0.21" opacity="0.75">
<a-image id="webvr" src="../_images/webvr.png" width="1" height="0.25" opacity="0.75">
<a-animation attribute="scale" from="1 0 1" to="0.75 0.75 0.75" begin="1500" dur="200" fill="both" easing="ease-out"></a-animation>
<a-animation attribute="position" from="0 -3 0" to="0 -0.7 0" begin="1000" dur="1000" fill="both" easing="ease-out"></a-animation>
</a-image>
Expand Down
Binary file modified examples/showcase-anime-UI/images/glow1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/ring1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/ring2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/ring3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/ring4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/ring5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/schematic1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/schematic2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/schematic3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/schematic4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/schematic5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/text1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/text2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/text3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-anime-UI/images/text4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/showcase-composite/index.html
Expand Up @@ -11,7 +11,7 @@

<a-sky src="../_skies/lake.jpg"></a-sky>
<a-model src="sculpture.dae" position="0 0 -2"></a-model>
<a-image src="portland.png" width="10" height="3.5" position="-2 1.2 1.2" scale="0.2 0.2 0.2"></a-image>
<a-image src="portland.png" width="10" height="5" position="-2 1.2 1.2" scale="0.2 0.2 0.2"></a-image>

</a-scene>
</body>
Expand Down
Binary file modified examples/showcase-composite/portland.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/showcase-curved-mockups/index.html
Expand Up @@ -12,7 +12,7 @@
<a-camera fov="80" position="0 1.8 0" near="0.2" cursor-color="#33CCFF"></a-camera>

<a-curvedimage src="../_images/ui/3.png" radius="5.7" theta-length="180" height="9" rotation="0 80 0" scale="1.2 1.2 1.2"></a-curvedimage>
<a-curvedimage src="../_images/mozvr.png" radius="5.7" theta-length="18" height=".36" rotation="0 80 0" position="0 2 0" opacity="0.2"></a-curvedimage>
<a-curvedimage src="../_images/mozvr.png" radius="5.7" theta-length="18" height=".5" rotation="0 80 0" position="0 2 0" opacity="0.2"></a-curvedimage>
<a-curvedimage src="../_images/ui/1.png" radius="5.7" theta-length="72" height="2.6" rotation="0 -45 0" position="0 0.7 0" scale="0.6 0.6 0.6"></a-curvedimage>
<a-curvedimage src="../_images/ui/2.png" radius="5.7" theta-length="72" height="3.02" rotation="0 100 0" scale="0.8 0.8 0.8"></a-curvedimage>

Expand Down
Binary file modified examples/showcase-shopping/fall.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions examples/showcase-shopping/index.html
Expand Up @@ -19,12 +19,12 @@
</a-entity>

<!-- Mozvr -->
<a-curvedimage src="../_images/mozvr.png" radius="5.7" theta-length="36" height=".73" position="0 2.6 0" opacity="0.5">
<a-curvedimage src="../_images/mozvr.png" radius="5.7" theta-length="36" height="1" position="0 2.6 0" opacity="0.5">
<a-animation attribute="rotation" from="0 10 0" to="0 55 0" begin="500" dur="1000"></a-animation>
</a-curvedimage>

<!-- Price -->
<a-image src="price.png" width="5" height="3.5" scale="0.2 0.2 0.2">
<a-image src="price.png" width="7" height="3.5" scale="0.2 0.2 0.2">
<a-animation attribute="position" from="0 2.8 -6" to="2.25 2.8 -6" begin="1000" dur="1000"></a-animation>
</a-image>

Expand All @@ -41,7 +41,7 @@
</a-curvedimage>

<!-- Shoes thumbnail -->
<a-curvedimage src="shoes.png" radius="5.7" theta-length="18" height=".67" position="0 0.9 0" scale=".4 .4 .4">
<a-curvedimage src="shoes.png" radius="5.7" theta-length="18" height=".8" position="0 0.9 0" scale=".4 .4 .4">
<a-animation attribute="rotation" from="0 -20 0" to="0 -30 0" begin="750" dur="1000"></a-animation>
</a-curvedimage>

Expand Down
Binary file modified examples/showcase-shopping/price.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/showcase-shopping/shoes.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0ed5088

Please sign in to comment.