Skip to content

Commit

Permalink
Fixed models scale
Browse files Browse the repository at this point in the history
  • Loading branch information
@liyasthomas
liyasthomas committed Oct 26, 2018
1 parent fb80b8f commit f7f94c5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 16 deletions.
8 changes: 4 additions & 4 deletions src/alphabets.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<!--Custom marker [B]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/B-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#bytt" scale="0.2 0.2 0.2" animation-mixer>
<a-entity gltf-model="#bytt" scale="0.05 0.05 0.05" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
Expand All @@ -97,7 +97,7 @@
<!--Custom marker [D]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/D-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#dog" scale="0.02 0.02 0.02" animation-mixer>
<a-entity gltf-model="#dog" scale="0.05 0.05 0.05" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
Expand All @@ -113,7 +113,7 @@
<!--Custom marker [F]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/F-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#fish" scale="0.02 0.02 0.02" animation-mixer>
<a-entity gltf-model="#fish" scale="0.005 0.005 0.005" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
Expand All @@ -129,7 +129,7 @@
<!--Custom marker [O]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/O-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#orange" scale="0.02 0.02 0.02" animation-mixer>
<a-entity gltf-model="#orange" scale="0.05 0.05 0.05" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
Expand Down
8 changes: 3 additions & 5 deletions src/animals.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,15 @@
<!--Custom marker [B]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/B-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#bytt" scale="0.25 0.25 0.25" animation-mixer>
<a-entity gltf-model="#bytt" scale="0.05 0.05 0.05" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
</a-marker>
<!--Custom marker [C]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/C-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-text side='double' position='0 1.75 0.5' scale='0.5 0.5 0.5' value="Lvr" align="center" rotation="-90 0 0">
</a-text>
<a-entity gltf-model="#fish" scale="0.02 0.02 0.02" animation-mixer>
<a-entity gltf-model="#fish" scale="0.005 0.005 0.005" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
Expand All @@ -103,7 +101,7 @@
<!--Custom marker [F]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/F-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#panda" scale="0.25 0.25 0.25" animation-mixer>
<a-entity gltf-model="#panda" scale="0.05 0.05 0.05" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
Expand Down
6 changes: 0 additions & 6 deletions src/chemistry.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,47 +69,41 @@
</a-marker>
<!--Custom marker [A]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/A-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#methane" scale="0.5 0.5 0.5" animation-mixer>
<a-animation attribute="rotation" to="360 360 360" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
</a-marker>
<!--Custom marker [B]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/B-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#ethane" scale="0.5 0.5 0.5" animation-mixer>
<a-animation attribute="rotation" to="360 360 360" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
</a-marker>
<!--Custom marker [C]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/C-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#cyclo-hexane" scale="0.5 0.5 0.5" animation-mixer>
<a-animation attribute="rotation" to="360 360 360" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
</a-marker>
<!--Custom marker [D]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/D-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#ethanol" scale="0.25 0.25 0.25" animation-mixer>
<a-animation attribute="rotation" to="360 360 360" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
</a-marker>
<!--Custom marker [F]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/F-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#pyrrole" scale="0.5 0.5 0.5" animation-mixer>
<a-animation attribute="rotation" to="360 360 360" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
</a-entity>
</a-marker>
<!--Custom marker [G]-->
<a-marker preset='custom' type='pattern' url='../assets/patt/G-90.patt'>
<a-plane rotation="-90 0 0" width="2" height="2" color="#000" shadow></a-plane>
<a-entity gltf-model="#nuclear_fission" scale="0.5 0.5 0.5" animation-mixer>
<a-animation attribute="rotation" to="0 360 0" dur="5000" easing="linear" repeat="indefinite">
</a-animation>
Expand Down
2 changes: 1 addition & 1 deletion src/entertainment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<a-marker preset='custom' type='pattern' url='../assets/patt/A-90.patt'>
<a-text side='double' position='0 1.75 0.5' scale='0.5 0.5 0.5' value="Lvr" align="center" rotation="-90 0 0">
</a-text>
<a-entity gltf-model="#avatar" scale="0.25 0.25 0.25" animation-mixer>
<a-entity gltf-model="#avatar" scale="0.2 0.2 0.2" animation-mixer>
</a-entity>
</a-marker>
<!--Sound-->
Expand Down

0 comments on commit f7f94c5

Please sign in to comment.