Skip to content

Commit 2dadba5

Browse files
kalwaltkalwalt
committed
Merge branch 'dev'
2 parents b3887ac + f18f3a7 commit 2dadba5

17 files changed

+609
-2
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ _site
33
.jekyll-cache
44
.jekyll-metadata
55
vendor
6-
Gemfile.lock

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source "https://rubygems.org"
77
#
88
# This will help ensure the proper Jekyll version is running.
99
# Happy Jekylling!
10-
gem "jekyll", "~> 4.0.0"
10+
gem "jekyll"
1111
# This is the default theme for new Jekyll sites. You may change this to anything you like.
1212
gem "bulma-clean-theme"
1313
group :jekyll_plugins do

‎Gemfile.lock

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
addressable (2.8.6)
5+
public_suffix (>= 2.0.2, < 6.0)
6+
bulma-clean-theme (1.0.2)
7+
jekyll (>= 4.3, < 5.0)
8+
jekyll-feed (~> 0.15)
9+
jekyll-paginate (~> 1.1)
10+
jekyll-seo-tag (~> 2.7)
11+
jekyll-sitemap (~> 1.4)
12+
kramdown-parser-gfm (~> 1.1)
13+
colorator (1.1.0)
14+
concurrent-ruby (1.3.1)
15+
em-websocket (0.5.3)
16+
eventmachine (>= 0.12.9)
17+
http_parser.rb (~> 0)
18+
eventmachine (1.2.7)
19+
ffi (1.17.0)
20+
ffi (1.17.0-arm64-darwin)
21+
ffi (1.17.0-x86_64-darwin)
22+
forwardable-extended (2.6.0)
23+
google-protobuf (3.25.3)
24+
google-protobuf (3.25.3-arm64-darwin)
25+
google-protobuf (3.25.3-x86_64-darwin)
26+
google-protobuf (3.25.3-x86_64-linux)
27+
http_parser.rb (0.8.0)
28+
i18n (1.14.5)
29+
concurrent-ruby (~> 1.0)
30+
jekyll (4.3.3)
31+
addressable (~> 2.4)
32+
colorator (~> 1.0)
33+
em-websocket (~> 0.5)
34+
i18n (~> 1.0)
35+
jekyll-sass-converter (>= 2.0, < 4.0)
36+
jekyll-watch (~> 2.0)
37+
kramdown (~> 2.3, >= 2.3.1)
38+
kramdown-parser-gfm (~> 1.0)
39+
liquid (~> 4.0)
40+
mercenary (>= 0.3.6, < 0.5)
41+
pathutil (~> 0.9)
42+
rouge (>= 3.0, < 5.0)
43+
safe_yaml (~> 1.0)
44+
terminal-table (>= 1.8, < 4.0)
45+
webrick (~> 1.7)
46+
jekyll-feed (0.17.0)
47+
jekyll (>= 3.7, < 5.0)
48+
jekyll-paginate (1.1.0)
49+
jekyll-pwa-plugin (2.2.3)
50+
jekyll-sass-converter (3.0.0)
51+
sass-embedded (~> 1.54)
52+
jekyll-seo-tag (2.8.0)
53+
jekyll (>= 3.8, < 5.0)
54+
jekyll-sitemap (1.4.0)
55+
jekyll (>= 3.7, < 5.0)
56+
jekyll-watch (2.2.1)
57+
listen (~> 3.0)
58+
kramdown (2.4.0)
59+
rexml
60+
kramdown-parser-gfm (1.1.0)
61+
kramdown (~> 2.0)
62+
liquid (4.0.4)
63+
listen (3.9.0)
64+
rb-fsevent (~> 0.10, >= 0.10.3)
65+
rb-inotify (~> 0.9, >= 0.9.10)
66+
mercenary (0.4.0)
67+
pathutil (0.16.2)
68+
forwardable-extended (~> 2.6)
69+
public_suffix (5.0.5)
70+
rake (13.2.1)
71+
rb-fsevent (0.11.2)
72+
rb-inotify (0.11.1)
73+
ffi (~> 1.0)
74+
rexml (3.2.8)
75+
strscan (>= 3.0.9)
76+
rouge (4.2.1)
77+
safe_yaml (1.0.5)
78+
sass-embedded (1.69.5)
79+
google-protobuf (~> 3.23)
80+
rake (>= 13.0.0)
81+
sass-embedded (1.69.5-arm64-darwin)
82+
google-protobuf (~> 3.23)
83+
sass-embedded (1.69.5-x86_64-darwin)
84+
google-protobuf (~> 3.23)
85+
strscan (3.1.0)
86+
terminal-table (3.0.2)
87+
unicode-display_width (>= 1.1.1, < 3)
88+
unicode-display_width (2.5.0)
89+
webrick (1.8.1)
90+
91+
PLATFORMS
92+
arm64-darwin
93+
ruby
94+
x86_64-darwin
95+
x86_64-linux
96+
97+
DEPENDENCIES
98+
bulma-clean-theme
99+
jekyll
100+
jekyll-pwa-plugin (= 2.2.3)
101+
102+
BUNDLED WITH
103+
2.5.11

‎examples/index.html

+5
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,8 @@
2525
<a href="/examples/multi_wasm_nft.html"><h2>Multi NFT WASM example with jsartoolkit5</h2></a>
2626
<p>A simple example that display three different 3d models. You need the <a href="/examples/Data/pinball.jpg">Pinball image</a>, <a href="/examples/Data/chalk_multi.jpg">chalk_multi image</a> and <a href="/examples/Data/kuva.jpg">Kuva image</a>
2727
</div>
28+
<div class="box">
29+
<a href="/examples/webarkit-testing"><h2>webarkit-testing examples</h2></a>
30+
<p>webarkit-testing examples from <a href="https://github.com/webarkit/webarkit-testing">webarkit/webarkit-testing</a> </p>
31+
</div>
32+

‎examples/webarkit-testing/akaze_example.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<title>Simple example with WebARKit</title>
7+
<meta http-equiv="X-UA-Compatible" content="chrome=1">
8+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
9+
<script src="./dist/GrayScale.js"></script>
10+
<script type="text/javascript" src="stats.min.js"></script>
11+
<script>
12+
function setTrackerType(){
13+
return 'akaze';
14+
}
15+
</script>
16+
<script src="worker_setup.js"></script>
17+
<link rel="stylesheet" href="css/style.css">
18+
</head>
19+
20+
<body>
21+
<div id="stats"></div>
22+
<img id="refIm" src="./data/pinball.jpg" width="1637" height="2048" style="display:none;">
23+
<img id="arElem" src="./data/aframe-k.png"></img>
24+
<div id="loading">Loading Image Tracking Modules...</div>
25+
</body>
26+
27+
</html>

‎examples/webarkit-testing/css/style.css

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
html,
2+
body {
3+
margin: 0;
4+
overflow: hidden;
5+
}
6+
7+
#arElem {
8+
position: absolute;
9+
width: 1637px;
10+
height: 2048px;
11+
display: none;
12+
border: 1px solid black;
13+
background: white;
14+
}
15+
16+
#loading {
17+
visibility: hidden;
18+
left: 50%;
19+
width: 200px;
20+
margin-left: -100px;
21+
background-color: #eee;
22+
text-align: center;
23+
border-radius: 10px;
24+
padding: 10px;
25+
position: fixed;
26+
z-index: 9999;
27+
bottom: 20px;
28+
font-size: 15px;
29+
word-wrap: break-word;
30+
}
31+
32+
#loading.show {
33+
visibility: visible;
34+
-webkit-animation: fadein 1.0s;
35+
animation: fadein 1.0s;
36+
}
37+
38+
#loading.hide {
39+
-webkit-animation: fadeout 1.0s;
40+
animation: fadeout 1.0s;
41+
}
42+
43+
@-webkit-keyframes fadein {
44+
from {bottom: 0; opacity: 0;}
45+
to {bottom: 30px; opacity: 1;}
46+
}
47+
48+
@keyframes fadein {
49+
from {bottom: 0; opacity: 0;}
50+
to {bottom: 30px; opacity: 1;}
51+
}
52+
53+
@-webkit-keyframes fadeout {
54+
from {bottom: 30px; opacity: 1;}
55+
to {bottom: 0; opacity: 0; visibility: hidden;}
56+
}
57+
58+
@keyframes fadeout {
59+
from {bottom: 30px; opacity: 1;}
60+
to {bottom: 0; opacity: 0; visibility: hidden;}
61+
}

‎examples/webarkit-testing/data/aframe-k.png

3.83 KB
Loading

‎examples/webarkit-testing/data/pinball.jpg

764 KB
Loading

‎examples/webarkit-testing/dist/GrayScale.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/webarkit-testing/dist/WebARKit.js

+2
Large diffs are not rendered by default.

‎examples/webarkit-testing/freak_example.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<title>Simple example with WebARKit</title>
7+
<meta http-equiv="X-UA-Compatible" content="chrome=1">
8+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
9+
<script src="./dist/GrayScale.js"></script>
10+
<script type="text/javascript" src="stats.min.js"></script>
11+
<script>
12+
function setTrackerType(){
13+
return 'freak';
14+
}
15+
</script>
16+
<script src="worker_setup.js"></script>
17+
<link rel="stylesheet" href="css/style.css">
18+
</head>
19+
20+
<body>
21+
<div id="stats"></div>
22+
<img id="refIm" src="./data/pinball.jpg" width="1637" height="2048" style="display:none;">
23+
<img id="arElem" src="./data/aframe-k.png"></img>
24+
<div id="loading">Loading Image Tracking Modules...</div>
25+
</body>
26+
27+
</html>

‎examples/webarkit-testing/index.html

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
layout: page
3+
title: WebAR Kit - webarkit-testing example page
4+
subtitle: Some examples showing webarkit-testing capabilities
5+
description: You can found in this page some examples with our experimental project webarkit-testing. Follow the isntructions for testing.
6+
permalink: /examples/webarkit-testing/
7+
---
8+
<div class="box">
9+
<p>
10+
We present here some of the examples of our experimental project for WebAR <a
11+
href="https://github.com/webarkit/webarkit-testing">webarkit-testing</a>
12+
Four examples with four trackers are available: Freak, Orb, Akaze and Teblid. To test you need the Pinball image
13+
see below.</p> <img src="/examples/Data/pinball.jpg" alt="Pinball image"
14+
title="pinball image to use for tracking" style="width:340px" />
15+
<br>
16+
<p>Wait until an image will be superimposed with a blue rect around it.
17+
Note that the examples are not yet intended to woks correctly on Mobile, better if you test on a desktop device.
18+
If you find an issue file one at our <a href="https://github.com/webarkit/webarkit-testing/issues">issue
19+
tracker</a>
20+
or if you want to comment or partecipate on the development start a <a
21+
href="https://github.com/webarkit/webarkit-testing/discussions">new discussion</a>
22+
</p>
23+
</div>
24+
<div class='box'>
25+
<a href="/examples/webarkit-testing/akaze_example.html">
26+
<h2>Akaze example with 2d tracking</h2>
27+
</a>
28+
<p>A simple WebARkit Akaze example that display an image.</p>
29+
</div>
30+
<div class='box'>
31+
<a href="/examples/webarkit-testing/freak_example.html">
32+
<h2>Freak example with 2d tracking</h2>
33+
</a>
34+
<p>A simple WebARKit Freak example that display an image.</p>
35+
</div>
36+
<div class='box'>
37+
<a href="/examples/webarkit-testing/orb_example.html">
38+
<h2>Orb example with 2d tracking</h2>
39+
</a>
40+
<p>A simple WebARKit Orb example that display an image.</p>
41+
</div>
42+
<div class='box'>
43+
<a href="/examples/webarkit-testing/teblid_example.html">
44+
<h2>Teblid example with 2d tracking</h2>
45+
</a>
46+
<p>A simple WebARKit Teblid example that display an image.</p>
47+
</div>

‎examples/webarkit-testing/orb_example.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE html>
2+
<html lang="">
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<title>Simple example with WebARKit</title>
7+
<meta http-equiv="X-UA-Compatible" content="chrome=1">
8+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
9+
<script src="./dist/GrayScale.js"></script>
10+
<script type="text/javascript" src="stats.min.js"></script>
11+
<script>
12+
function setTrackerType(){
13+
return 'orb';
14+
}
15+
</script>
16+
<script src="worker_setup.js"></script>
17+
<link rel="stylesheet" href="css/style.css">
18+
</head>
19+
20+
<body>
21+
<div id="stats"></div>
22+
<img id="refIm" src="./data/pinball.jpg" width="1637" height="2048" style="display:none;">
23+
<img id="arElem" src="./data/aframe-k.png"></img>
24+
<div id="loading">Loading Image Tracking Modules...</div>
25+
</body>
26+
27+
</html>

‎examples/webarkit-testing/stats.min.js

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/webarkit-testing/teblid_example.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<title>Simple example with WebARKit</title>
7+
<meta http-equiv="X-UA-Compatible" content="chrome=1">
8+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
9+
<script src="./dist/GrayScale.js"></script>
10+
<script type="text/javascript" src="stats.min.js"></script>
11+
<script>
12+
function setTrackerType(){
13+
return 'teblid';
14+
}
15+
</script>
16+
<script src="worker_setup.js"></script>
17+
<link rel="stylesheet" href="css/style.css">
18+
</head>
19+
20+
<body>
21+
<div id="stats"></div>
22+
<img id="refIm" src="./data/pinball.jpg" width="1637" height="2048" style="display:none;">
23+
<img id="arElem" src="./data/aframe-k.png"></img>
24+
<div id="loading">Loading Image Tracking Modules...</div>
25+
</body>
26+
27+
</html>

0 commit comments

Comments
 (0)