Skip to content

Commit

Permalink
Updated ruby gems and added gibbon model
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin-Mattheus-Moerman committed Dec 10, 2023
1 parent 525d9a2 commit 1dc274a
Show file tree
Hide file tree
Showing 5 changed files with 22,434 additions and 26 deletions.
35 changes: 19 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
google-protobuf (3.25.1)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.1)
jekyll (4.3.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand All @@ -30,34 +31,36 @@ GEM
safe_yaml (~> 1.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.0)
public_suffix (5.0.4)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (4.0.0)
rexml (3.2.6)
rouge (4.2.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sass-embedded (1.69.5)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.3.0)
webrick (1.7.0)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
ruby
Expand Down
20 changes: 10 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@
</a-marker>

<!-- Spur gear pair -->
<a-marker type='barcode' value='489'>
<a-marker type='barcode' value='489'>
<a-entity scale="0.5 0.5 0.5" position="0 0 0">

<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 -720 0; loop: true; dur: 10000">
</a-entity>
<a-entity obj-model="obj: url(/models/spur_gear_m2_N10_core_r6.obj); mtl: url(/models/spur_gear_m2_N10_core_r6.mtl)"
position="1.5 0 0" rotation="0 0 0" animation="property: rotation; to: 0 1440 0; loop: true; dur: 10000">
</a-entity>
</a-entity>

</a-entity>
</a-entity>
</a-entity>
</a-marker>

<!-- Planetary gear, static carrier -->
<a-marker type='barcode' value='25'>
<a-marker type='barcode' value='25'>
<a-entity scale="0.5 0.5 0.5" position="0 0 0">

<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 -720 0; loop: true; dur: 10000">
</a-entity>
Expand All @@ -63,7 +63,7 @@
</a-marker>

<!-- Planetary gear, static sun -->
<a-marker type='barcode' value='180'>
<a-marker type='barcode' value='180'>
<a-entity scale="0.5 0.5 0.5" position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 720 0; loop: true; dur: 10000">

<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
Expand All @@ -86,7 +86,7 @@
</a-marker>

<!-- Planetary gear, static ring -->
<a-marker type='barcode' value='143'>
<a-marker type='barcode' value='143'>
<a-entity scale="0.5 0.5 0.5" position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 -360 0; loop: true; dur: 10000">

<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
Expand All @@ -106,8 +106,8 @@
</a-entity>

</a-entity>
</a-marker>
</a-marker>

<a-entity camera></a-entity>
</a-scene>
</body>
Expand Down
15 changes: 15 additions & 0 deletions models/gibbon.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Blender 3.5.1 MTL File: 'None'
# www.blender.org

newmtl gibbon
Ns 0.000000
Ka 1 1 1
Kd 1 1 1
Ks 0 0 0
illum 1
Ns 0
Ni 1.450000
d 1
Tr 0
map_Kd gibbon.png
map_d gibbon.png
Loading

0 comments on commit 1dc274a

Please sign in to comment.