Add rotation support for SSAA in SVG; switch to Material Design icons
This commit is contained in:
parent
b005e6d165
commit
529a3eae23
|
@ -28,6 +28,15 @@
|
|||
src: url("/woff2/inter-ui/Inter-UI-BoldItalic.woff2") format('woff2');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: "Material Icons";
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: local('Material Icons'),
|
||||
local('MaterialIcons-Regular'),
|
||||
url("/woff2/material-icons/MaterialIcons-Regular.woff2") format('woff2');
|
||||
}
|
||||
|
||||
/*
|
||||
* Core
|
||||
*/
|
||||
|
@ -51,7 +60,7 @@ nav {
|
|||
left: 1em;
|
||||
margin: 0;
|
||||
}
|
||||
#pf-settings-container {
|
||||
#pf-settings-container, #pf-rotate-slider-container {
|
||||
position: absolute;
|
||||
right: 1rem;
|
||||
bottom: 2rem;
|
||||
|
@ -61,7 +70,7 @@ nav {
|
|||
#pf-toolbar {
|
||||
margin-right: 1rem;
|
||||
}
|
||||
#pf-settings {
|
||||
#pf-settings, #pf-rotate-slider-card {
|
||||
text-align: initial;
|
||||
user-select: none;
|
||||
-moz-user-select: none;
|
||||
|
@ -69,7 +78,7 @@ nav {
|
|||
transition: opacity 300ms, transform 300ms, visibility 300ms;
|
||||
transform: translateY(0);
|
||||
}
|
||||
#pf-settings:not(.pf-invisible) {
|
||||
#pf-settings:not(.pf-invisible), #pf-rotate-slider-card:not(.pf-invisible) {
|
||||
pointer-events: auto;
|
||||
}
|
||||
.pf-toolbar-button {
|
||||
|
@ -85,7 +94,7 @@ nav {
|
|||
position: absolute;
|
||||
visibility: hidden;
|
||||
}
|
||||
#pf-settings.pf-invisible {
|
||||
#pf-settings.pf-invisible, #pf-rotate-slider-card.pf-invisible {
|
||||
opacity: 0.0;
|
||||
transform: translateY(1em);
|
||||
visibility: hidden;
|
||||
|
@ -162,6 +171,15 @@ button > svg path {
|
|||
.pf-benchmark-results-label {
|
||||
font-weight: bold;
|
||||
}
|
||||
.pf-material-icons {
|
||||
font-family: "Material Icons";
|
||||
display: block;
|
||||
font-size: 18px;
|
||||
margin: -3px 0 -3px;
|
||||
}
|
||||
#pf-rotate-slider {
|
||||
margin: 2px 0 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Arrow
|
||||
|
@ -169,9 +187,16 @@ button > svg path {
|
|||
* http://www.cssarrowplease.com/
|
||||
*/
|
||||
|
||||
#pf-settings > .pf-arrow-box:after, #pf-settings .pf-arrow-box:before {
|
||||
right: 22px;
|
||||
}
|
||||
|
||||
#pf-rotate-slider-card > .pf-arrow-box:after, #pf-rotate-slider-card .pf-arrow-box:before {
|
||||
right: 166px;
|
||||
}
|
||||
|
||||
.pf-arrow-box:after, .pf-arrow-box:before {
|
||||
top: 100%;
|
||||
right: 22px;
|
||||
border: solid transparent;
|
||||
content: " ";
|
||||
height: 0;
|
||||
|
@ -192,22 +217,6 @@ button > svg path {
|
|||
margin-right: -15px;
|
||||
}
|
||||
|
||||
#pf-zoom-pulse-button {
|
||||
padding: 16px 30px 16px 14px;
|
||||
}
|
||||
|
||||
/* https://www.h3xed.com/web-development/how-to-make-css-play-pause-icons-with-a-single-div */
|
||||
#pf-play-icon {
|
||||
position: absolute;
|
||||
display: block;
|
||||
width: 0;
|
||||
height: 0;
|
||||
margin: -6px 3px 0;
|
||||
border-top: 6px solid transparent;
|
||||
border-left: 12px solid currentColor;
|
||||
border-bottom: 6px solid transparent;
|
||||
}
|
||||
|
||||
.github-corner {
|
||||
display: block;
|
||||
position: absolute;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<div id="pf-toolbar">
|
||||
<button id="pf-screenshot-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
{{octicon "device-camera"}}
|
||||
<span class="pf-material-icons">photo_camera</span>
|
||||
</button>
|
||||
<div id="pf-settings-container">
|
||||
<div id="pf-settings" class="card mb-4 pf-invisible">
|
||||
|
@ -40,7 +40,7 @@
|
|||
<button id="pf-settings-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button"
|
||||
aria-expanded="false" aria-controls="#pf-settings">
|
||||
{{octicon "gear"}}
|
||||
<span class="pf-material-icons">settings</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<link rel="stylesheet" href="/css/bootstrap/bootstrap.css">
|
||||
<link rel="stylesheet" href="/css/octicons/octicons.css">
|
||||
<link rel="stylesheet" href="/css/pathfinder.css">
|
||||
<script type="text/javascript" src="/js/jquery/jquery.js"></script>
|
||||
<script type="text/javascript" src="/js/popper.js/popper.js"></script>
|
||||
|
|
|
@ -17,20 +17,39 @@
|
|||
<div class="btn-group" role="group" aria-label="Zoom">
|
||||
<button id="pf-zoom-out-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
{{octicon "dash"}}
|
||||
<span class="pf-material-icons">remove</span>
|
||||
</button>
|
||||
<button id="pf-zoom-in-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
{{octicon "plus"}}
|
||||
<span class="pf-material-icons">add</span>
|
||||
</button>
|
||||
</div>
|
||||
<div id="pf-rotate-slider-container">
|
||||
<div id="pf-rotate-slider-card" class="card mb-4 pf-invisible">
|
||||
<div class="card-body">
|
||||
<form class="d-inline mr-3">
|
||||
<input id="pf-rotate-slider" type="range" min="-3.14159"
|
||||
max="3.14159" step="0.006136" value="0.0" autocomplete="off">
|
||||
</form>
|
||||
<button id="pf-rotate-close-button" type="button" class="close"
|
||||
aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="pf-arrow-box"></div>
|
||||
</div>
|
||||
</div>
|
||||
<button id="pf-rotate-button" type="button" title="Rotate"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
<span class="pf-material-icons">rotate_left</span>
|
||||
</button>
|
||||
<button id="pf-zoom-pulse-button" type="button" title="Pulse Zoom"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
<span id="pf-play-icon"></span>
|
||||
<span class="pf-material-icons">play_arrow</span>
|
||||
</button>
|
||||
<button id="pf-screenshot-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
{{octicon "device-camera"}}
|
||||
<span class="pf-material-icons">photo_camera</span>
|
||||
</button>
|
||||
<div id="pf-settings-container">
|
||||
<div id="pf-settings" class="card mb-4 pf-invisible">
|
||||
|
@ -64,7 +83,9 @@
|
|||
</div>
|
||||
<button id="pf-settings-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button" aria-expanded="false"
|
||||
aria-controls="#pf-settings">{{octicon "gear"}}</button>
|
||||
aria-controls="#pf-settings">
|
||||
<span class="pf-material-icons">settings</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{{>partials/spinner.html}}
|
||||
|
|
|
@ -16,20 +16,20 @@
|
|||
<div class="btn-group" role="group" aria-label="Zoom">
|
||||
<button id="pf-zoom-out-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
{{octicon "dash"}}
|
||||
<span class="pf-material-icons">remove</span>
|
||||
</button>
|
||||
<button id="pf-zoom-in-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
{{octicon "plus"}}
|
||||
<span class="pf-material-icons">add</span>
|
||||
</button>
|
||||
</div>
|
||||
<button id="pf-zoom-pulse-button" type="button" title="Pulse Zoom"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
<span id="pf-play-icon"></span>
|
||||
<span class="pf-material-icons">play_arrow</span>
|
||||
</button>
|
||||
<button id="pf-screenshot-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button">
|
||||
{{octicon "device-camera"}}
|
||||
<span class="pf-material-icons">photo_camera</span>
|
||||
</button>
|
||||
<div id="pf-settings-container">
|
||||
<div id="pf-settings" class="card mb-4 pf-invisible">
|
||||
|
@ -86,7 +86,9 @@
|
|||
</div>
|
||||
<button id="pf-settings-button" type="button"
|
||||
class="btn btn-outline-secondary pf-toolbar-button" aria-expanded="false"
|
||||
aria-controls="#pf-settings">{{octicon "gear"}}</button>
|
||||
aria-controls="#pf-settings">
|
||||
<span class="pf-material-icons">settings</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal fade" id="pf-edit-text-modal" tabindex="-1" role="dialog"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
"image-ssim": "^0.2.0",
|
||||
"jquery": "^3.2.1",
|
||||
"lodash": "^4.17.4",
|
||||
"octicons": "^6.0.1",
|
||||
"opentype.js": "^0.7.3",
|
||||
"papaparse": "^4.3.6",
|
||||
"parse-color": "^1.0.0",
|
||||
|
|
|
@ -131,35 +131,8 @@ export abstract class DemoAppController<View extends DemoView> extends AppContro
|
|||
start() {
|
||||
super.start();
|
||||
|
||||
const settingsCard = document.getElementById('pf-settings') as (HTMLElement | null);
|
||||
const settingsButton = document.getElementById('pf-settings-button') as
|
||||
(HTMLButtonElement | null);
|
||||
const settingsCloseButton = document.getElementById('pf-settings-close-button') as
|
||||
(HTMLButtonElement | null);
|
||||
|
||||
if (settingsButton != null) {
|
||||
settingsButton.addEventListener('click', event => {
|
||||
event.stopPropagation();
|
||||
unwrapNull(settingsCard).classList.toggle('pf-invisible');
|
||||
}, false);
|
||||
}
|
||||
if (settingsCloseButton != null) {
|
||||
settingsCloseButton.addEventListener('click', () => {
|
||||
unwrapNull(settingsCard).classList.add('pf-invisible');
|
||||
}, false);
|
||||
}
|
||||
if (settingsCard != null) {
|
||||
document.body.addEventListener('click', event => {
|
||||
let element = event.target as Element | null;
|
||||
while (element != null) {
|
||||
if (element === settingsCard)
|
||||
return;
|
||||
element = element.parentElement;
|
||||
}
|
||||
|
||||
settingsCard.classList.add('pf-invisible');
|
||||
}, false);
|
||||
}
|
||||
this.initPopup('pf-settings', 'pf-settings-button', 'pf-settings-close-button');
|
||||
this.initPopup('pf-rotate-slider-card', 'pf-rotate-button', 'pf-rotate-close-button');
|
||||
|
||||
const screenshotButton = document.getElementById('pf-screenshot-button') as
|
||||
HTMLButtonElement | null;
|
||||
|
@ -193,6 +166,16 @@ export abstract class DemoAppController<View extends DemoView> extends AppContro
|
|||
}, false);
|
||||
}
|
||||
|
||||
const rotateSlider = document.getElementById('pf-rotate-slider') as HTMLInputElement |
|
||||
null;
|
||||
if (rotateSlider != null) {
|
||||
rotateSlider.addEventListener('input', event => {
|
||||
this.view.then(view => {
|
||||
view.rotate((event.target as HTMLInputElement).valueAsNumber);
|
||||
});
|
||||
}, false);
|
||||
}
|
||||
|
||||
this.filePickerView = FilePickerView.create();
|
||||
if (this.filePickerView != null) {
|
||||
this.filePickerView.onFileLoaded = fileData => this.fileLoaded(fileData, null);
|
||||
|
@ -301,6 +284,38 @@ export abstract class DemoAppController<View extends DemoView> extends AppContro
|
|||
});
|
||||
}
|
||||
|
||||
private initPopup(cardID: string, popupButtonID: string, closeButtonID: string): void {
|
||||
const card = document.getElementById(cardID) as HTMLElement | null;
|
||||
const button = document.getElementById(popupButtonID) as HTMLButtonElement | null;
|
||||
const closeButton = document.getElementById(closeButtonID) as HTMLButtonElement | null;
|
||||
|
||||
if (button != null) {
|
||||
button.addEventListener('click', event => {
|
||||
event.stopPropagation();
|
||||
unwrapNull(card).classList.toggle('pf-invisible');
|
||||
}, false);
|
||||
}
|
||||
if (closeButton != null) {
|
||||
closeButton.addEventListener('click', () => {
|
||||
unwrapNull(card).classList.add('pf-invisible');
|
||||
}, false);
|
||||
}
|
||||
|
||||
if (card == null)
|
||||
return;
|
||||
|
||||
document.body.addEventListener('click', event => {
|
||||
let element = event.target as Element | null;
|
||||
while (element != null) {
|
||||
if (element === card)
|
||||
return;
|
||||
element = element.parentElement;
|
||||
}
|
||||
|
||||
card.classList.add('pf-invisible');
|
||||
}, false);
|
||||
}
|
||||
|
||||
private loadGammaLUT(): Promise<HTMLImageElement> {
|
||||
return window.fetch(GAMMA_LUT_URI)
|
||||
.then(response => response.blob())
|
||||
|
|
|
@ -86,14 +86,17 @@ export abstract class Camera {
|
|||
abstract zoom(scale: number): void;
|
||||
abstract zoomIn(): void;
|
||||
abstract zoomOut(): void;
|
||||
abstract rotate(newAngle: number): void;
|
||||
}
|
||||
|
||||
export class OrthographicCamera extends Camera {
|
||||
onPan: (() => void) | null;
|
||||
onZoom: (() => void) | null;
|
||||
onRotate: (() => void) | null;
|
||||
|
||||
translation: glmatrix.vec2;
|
||||
scale: number;
|
||||
rotationAngle: number;
|
||||
|
||||
private _bounds: glmatrix.vec4;
|
||||
|
||||
|
@ -115,6 +118,7 @@ export class OrthographicCamera extends Camera {
|
|||
|
||||
this.translation = glmatrix.vec2.create();
|
||||
this.scale = 1.0;
|
||||
this.rotationAngle = 0.0;
|
||||
|
||||
this._bounds = glmatrix.vec4.create();
|
||||
|
||||
|
@ -125,6 +129,7 @@ export class OrthographicCamera extends Camera {
|
|||
|
||||
this.onPan = null;
|
||||
this.onZoom = null;
|
||||
this.onRotate = null;
|
||||
}
|
||||
|
||||
onWheel(event: MouseWheelEvent): void {
|
||||
|
@ -149,7 +154,7 @@ export class OrthographicCamera extends Camera {
|
|||
glmatrix.vec2.scale(mouseLocation, mouseLocation, window.devicePixelRatio);
|
||||
|
||||
const scale = 1.0 - event.deltaY * window.devicePixelRatio * ORTHOGRAPHIC_ZOOM_SPEED;
|
||||
this._zoom(scale, mouseLocation);
|
||||
this.doZoom(scale, mouseLocation);
|
||||
}
|
||||
|
||||
zoomToFit(): void {
|
||||
|
@ -170,15 +175,22 @@ export class OrthographicCamera extends Camera {
|
|||
}
|
||||
|
||||
zoom(scale: number): void {
|
||||
this._zoom(scale, this.centerPoint);
|
||||
this.doZoom(scale, this.centerPoint);
|
||||
}
|
||||
|
||||
zoomIn(): void {
|
||||
this._zoom(ORTHOGRAPHIC_ZOOM_IN_FACTOR, this.centerPoint);
|
||||
this.doZoom(ORTHOGRAPHIC_ZOOM_IN_FACTOR, this.centerPoint);
|
||||
}
|
||||
|
||||
zoomOut(): void {
|
||||
this._zoom(ORTHOGRAPHIC_ZOOM_OUT_FACTOR, this.centerPoint);
|
||||
this.doZoom(ORTHOGRAPHIC_ZOOM_OUT_FACTOR, this.centerPoint);
|
||||
}
|
||||
|
||||
rotate(newAngle: number): void {
|
||||
this.rotationAngle = newAngle;
|
||||
|
||||
if (this.onRotate != null)
|
||||
this.onRotate();
|
||||
}
|
||||
|
||||
private onMouseDown(event: MouseEvent): void {
|
||||
|
@ -233,7 +245,7 @@ export class OrthographicCamera extends Camera {
|
|||
}
|
||||
}
|
||||
|
||||
private _zoom(scale: number, point: glmatrix.vec2): void {
|
||||
private doZoom(scale: number, point: glmatrix.vec2): void {
|
||||
const absoluteTranslation = glmatrix.vec2.create();
|
||||
glmatrix.vec2.sub(absoluteTranslation, this.translation, point);
|
||||
glmatrix.vec2.scale(absoluteTranslation, absoluteTranslation, 1.0 / this.scale);
|
||||
|
@ -323,6 +335,10 @@ export class PerspectiveCamera extends Camera {
|
|||
// TODO(pcwalton)
|
||||
}
|
||||
|
||||
rotate(newAngle: number): void {
|
||||
// TODO(pcwalton)
|
||||
}
|
||||
|
||||
private onMouseDown(event: MouseEvent): void {
|
||||
if (document.pointerLockElement !== this.canvas) {
|
||||
this.canvas.requestPointerLock();
|
||||
|
|
|
@ -149,6 +149,7 @@ class SVGDemoRenderer extends Renderer {
|
|||
this.camera = new OrthographicCamera(renderContext.canvas, { scaleBounds: true });
|
||||
this.camera.onPan = () => this.renderContext.setDirty();
|
||||
this.camera.onZoom = () => this.renderContext.setDirty();
|
||||
this.camera.onRotate = () => this.renderContext.setDirty();
|
||||
}
|
||||
|
||||
setHintsUniform(uniforms: UniformMap): void {
|
||||
|
@ -195,14 +196,22 @@ class SVGDemoRenderer extends Renderer {
|
|||
}
|
||||
|
||||
protected get worldTransform(): glmatrix.mat4 {
|
||||
const canvas = this.renderContext.canvas;
|
||||
|
||||
const transform = glmatrix.mat4.create();
|
||||
const translation = this.camera.translation;
|
||||
|
||||
glmatrix.mat4.translate(transform, transform, [-1.0, -1.0, 0.0]);
|
||||
glmatrix.mat4.scale(transform, transform, [
|
||||
2.0 / this.renderContext.canvas.width,
|
||||
2.0 / this.renderContext.canvas.height,
|
||||
1.0,
|
||||
]);
|
||||
glmatrix.mat4.scale(transform, transform, [2.0 / canvas.width, 2.0 / canvas.height, 1.0]);
|
||||
|
||||
if (!(this.antialiasingStrategy instanceof XCAAStrategy)) {
|
||||
const centerPoint = glmatrix.vec3.clone([canvas.width * 0.5, canvas.height * 0.5, 0.0]);
|
||||
glmatrix.mat4.translate(transform, transform, centerPoint);
|
||||
glmatrix.mat4.rotateZ(transform, transform, this.camera.rotationAngle);
|
||||
glmatrix.vec3.negate(centerPoint, centerPoint);
|
||||
glmatrix.mat4.translate(transform, transform, centerPoint);
|
||||
}
|
||||
|
||||
const translation = this.camera.translation;
|
||||
glmatrix.mat4.translate(transform, transform, [translation[0], translation[1], 0]);
|
||||
glmatrix.mat4.scale(transform, transform, [this.camera.scale, this.camera.scale, 1.0]);
|
||||
return transform;
|
||||
|
|
|
@ -100,6 +100,10 @@ export abstract class PathfinderView {
|
|||
this.pulseHandle = window.requestAnimationFrame(tick);
|
||||
}
|
||||
|
||||
rotate(newAngle: number): void {
|
||||
this.camera.rotate(newAngle);
|
||||
}
|
||||
|
||||
redraw(): void {
|
||||
this.dirty = false;
|
||||
}
|
||||
|
|
|
@ -77,14 +77,13 @@ static STATIC_TOOLS_INTEGRATION_TEST_PATH: &'static str = "../client/integration
|
|||
static STATIC_TOOLS_MESH_DEBUGGER_PATH: &'static str = "../client/mesh-debugger.html";
|
||||
static STATIC_DOC_API_PATH: &'static str = "../../font-renderer/target/doc";
|
||||
static STATIC_CSS_BOOTSTRAP_PATH: &'static str = "../client/node_modules/bootstrap/dist/css";
|
||||
static STATIC_CSS_OCTICONS_PATH: &'static str = "../client/node_modules/octicons/build";
|
||||
static STATIC_CSS_PATHFINDER_PATH: &'static str = "../client/css/pathfinder.css";
|
||||
static STATIC_JS_BOOTSTRAP_PATH: &'static str = "../client/node_modules/bootstrap/dist/js";
|
||||
static STATIC_JS_JQUERY_PATH: &'static str = "../client/node_modules/jquery/dist";
|
||||
static STATIC_JS_POPPER_JS_PATH: &'static str = "../client/node_modules/popper.js/dist/umd";
|
||||
static STATIC_JS_PATHFINDER_PATH: &'static str = "../client";
|
||||
static STATIC_SVG_OCTICONS_PATH: &'static str = "../client/node_modules/octicons/build/svg";
|
||||
static STATIC_WOFF2_INTER_UI_PATH: &'static str = "../../resources/fonts/inter-ui";
|
||||
static STATIC_WOFF2_MATERIAL_ICONS_PATH: &'static str = "../../resources/fonts/material-icons";
|
||||
static STATIC_GLSL_PATH: &'static str = "../../shaders";
|
||||
static STATIC_DATA_PATH: &'static str = "../../resources/data";
|
||||
static STATIC_TEST_DATA_PATH: &'static str = "../../resources/tests";
|
||||
|
@ -578,10 +577,6 @@ fn static_doc_api(file: PathBuf) -> Option<NamedFile> {
|
|||
fn static_css_bootstrap(file: PathBuf) -> Option<NamedFile> {
|
||||
NamedFile::open(Path::new(STATIC_CSS_BOOTSTRAP_PATH).join(file)).ok()
|
||||
}
|
||||
#[get("/css/octicons/<file..>")]
|
||||
fn static_css_octicons(file: PathBuf) -> Option<NamedFile> {
|
||||
NamedFile::open(Path::new(STATIC_CSS_OCTICONS_PATH).join(file)).ok()
|
||||
}
|
||||
#[get("/css/pathfinder.css")]
|
||||
fn static_css_pathfinder_css() -> io::Result<NamedFile> {
|
||||
NamedFile::open(STATIC_CSS_PATHFINDER_PATH)
|
||||
|
@ -602,14 +597,14 @@ fn static_js_popper_js(file: PathBuf) -> Option<NamedFile> {
|
|||
fn static_js_pathfinder(file: PathBuf) -> Option<NamedFile> {
|
||||
NamedFile::open(Path::new(STATIC_JS_PATHFINDER_PATH).join(file)).ok()
|
||||
}
|
||||
#[get("/svg/octicons/<file..>")]
|
||||
fn static_svg_octicons(file: PathBuf) -> Option<NamedFile> {
|
||||
NamedFile::open(Path::new(STATIC_SVG_OCTICONS_PATH).join(file)).ok()
|
||||
}
|
||||
#[get("/woff2/inter-ui/<file..>")]
|
||||
fn static_woff2_inter_ui(file: PathBuf) -> Option<NamedFile> {
|
||||
NamedFile::open(Path::new(STATIC_WOFF2_INTER_UI_PATH).join(file)).ok()
|
||||
}
|
||||
#[get("/woff2/material-icons/<file..>")]
|
||||
fn static_woff2_material_icons(file: PathBuf) -> Option<NamedFile> {
|
||||
NamedFile::open(Path::new(STATIC_WOFF2_MATERIAL_ICONS_PATH).join(file)).ok()
|
||||
}
|
||||
#[get("/glsl/<file..>")]
|
||||
fn static_glsl(file: PathBuf) -> Option<Shader> {
|
||||
Shader::open(Path::new(STATIC_GLSL_PATH).join(file)).ok()
|
||||
|
@ -688,14 +683,13 @@ fn main() {
|
|||
static_doc_api_index,
|
||||
static_doc_api,
|
||||
static_css_bootstrap,
|
||||
static_css_octicons,
|
||||
static_css_pathfinder_css,
|
||||
static_js_bootstrap,
|
||||
static_js_jquery,
|
||||
static_js_popper_js,
|
||||
static_js_pathfinder,
|
||||
static_svg_octicons,
|
||||
static_woff2_inter_ui,
|
||||
static_woff2_material_icons,
|
||||
static_glsl,
|
||||
static_otf_demo,
|
||||
static_svg_demo,
|
||||
|
|
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
Binary file not shown.
Loading…
Reference in New Issue