Merge "Make index.html actually an index."
diff --git a/y2020/BUILD b/y2020/BUILD
index bfa6ce2..320a0cf 100644
--- a/y2020/BUILD
+++ b/y2020/BUILD
@@ -26,9 +26,6 @@
name = "pi_download",
data = [
":config.json",
- "//y2020/www:files",
- "//y2020/www:flatbuffers",
- "//y2020/www:main_bundle",
],
dirs = [
"//y2020/www:www_files",
@@ -175,7 +172,7 @@
"//aos/network:web_proxy_main",
"//y2020/www:files",
"//y2020/www:flatbuffers",
- "//y2020/www:main_bundle",
+ "//y2020/www:camera_main_bundle",
],
)
diff --git a/y2020/www/BUILD b/y2020/www/BUILD
index a035d84..6b27c66 100644
--- a/y2020/www/BUILD
+++ b/y2020/www/BUILD
@@ -3,10 +3,10 @@
load("//frc971/downloader:downloader.bzl", "aos_downloader_dir")
ts_library(
- name = "main",
+ name = "camera_main",
srcs = [
"image_handler.ts",
- "main.ts",
+ "camera_main.ts",
],
visibility = ["//y2020:__subpackages__"],
deps = [
@@ -30,11 +30,11 @@
)
rollup_bundle(
- name = "main_bundle",
- entry_point = "y2020/www/main",
+ name = "camera_main_bundle",
+ entry_point = "y2020/www/camera_main",
visibility = ["//y2020:__subpackages__"],
deps = [
- "main",
+ "camera_main",
],
)
@@ -71,9 +71,10 @@
aos_downloader_dir(
name = "www_files",
srcs = [
+ ":camera_main_bundle",
+ ":field_main_bundle",
":files",
":flatbuffers",
- ":main_bundle",
],
dir = "www",
visibility = ["//visibility:public"],
diff --git a/y2020/www/main.ts b/y2020/www/camera_main.ts
similarity index 100%
rename from y2020/www/main.ts
rename to y2020/www/camera_main.ts
diff --git a/y2020/www/camera_viewer.html b/y2020/www/camera_viewer.html
new file mode 100644
index 0000000..4a61d7a
--- /dev/null
+++ b/y2020/www/camera_viewer.html
@@ -0,0 +1,10 @@
+<html>
+ <head>
+ <script src="flatbuffers.js"></script>
+ <script src="camera_main_bundle.min.js" defer></script>
+ <link rel="stylesheet" href="styles.css">
+ </head>
+ <body>
+ </body>
+</html>
+
diff --git a/y2020/www/field_handler.ts b/y2020/www/field_handler.ts
index f05f5d5..0d2ea34 100644
--- a/y2020/www/field_handler.ts
+++ b/y2020/www/field_handler.ts
@@ -204,7 +204,6 @@
this.drawField();
//draw cameras
if (this.imageMatchResult) {
- console.log(this.imageMatchResult.cameraPosesLength());
for (const i = 0; i < this.imageMatchResult.cameraPosesLength(); i++) {
const pose = this.imageMatchResult.cameraPoses(i);
const mat = pose.fieldToCamera();
diff --git a/y2020/www/index.html b/y2020/www/index.html
index 20b9785..f9ceca2 100644
--- a/y2020/www/index.html
+++ b/y2020/www/index.html
@@ -1,9 +1,6 @@
<html>
- <head>
- <script src="flatbuffers.js"></script>
- <script src="main_bundle.min.js" defer></script>
- <link rel="stylesheet" href="styles.css">
- </head>
<body>
+ <a href="camera_viewer.html">Camera Viewer</a><br>
+ <a href="field.html">Field Visualization</a>
</body>
</html>