feat: process ray files with wasm module
ci/woodpecker/push/build Pipeline failed
Details
ci/woodpecker/push/build Pipeline failed
Details
This commit is contained in:
Emerald
parent
8f34d02913
commit
482bb65a09
GPG Key ID:
13F7EFB915A0F623
|
|
@ -0,0 +1,8 @@
|
|||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: cargo
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: daily
|
||||
time: "08:00"
|
||||
open-pull-requests-limit: 10
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
/target
|
||||
**/*.rs.bk
|
||||
Cargo.lock
|
||||
bin/
|
||||
pkg/
|
||||
wasm-pack.log
|
||||
*zip
|
||||
!examples/*
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"rust-analyzer.showUnlinkedFileNotification": false
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
[package]
|
||||
name = "cathode-ray"
|
||||
version = "0.1.0"
|
||||
authors = ["Emerald <emerald@emeraldgreen.dev>"]
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
description = "File format implementation for Cathode"
|
||||
repository = "https://codeberg.org/anactualemerald/cathode"
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib", "rlib"]
|
||||
|
||||
[features]
|
||||
default = ["console_error_panic_hook"]
|
||||
|
||||
[dependencies]
|
||||
wasm-bindgen = "0.2.84"
|
||||
|
||||
# The `console_error_panic_hook` crate provides better debugging of panics by
|
||||
# logging them with `console.error`. This is great for development, but requires
|
||||
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
|
||||
# code size when deploying.
|
||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
||||
zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
|
||||
thiserror = "1.0.50"
|
||||
serde_json = "1.0.107"
|
||||
tracing = "0.1.40"
|
||||
serde = { version = "1.0.189", features = ["derive"] }
|
||||
base64 = "0.21.5"
|
||||
image = { version = "0.24.7", default-features = false, features = ["png", "tiff", "jpeg", "gif", "qoi"] }
|
||||
|
||||
[dev-dependencies]
|
||||
tracing-subscriber = "0.3.17"
|
||||
wasm-bindgen-test = "0.3.34"
|
||||
|
||||
[profile.release]
|
||||
# Tell `rustc` to optimize for small code size.
|
||||
opt-level = "s"
|
||||
|
|
@ -0,0 +1,201 @@
|
|||
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.
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
Copyright (c) 2018 Emerald <emerald_actual@proton.me>
|
||||
|
||||
Permission is hereby granted, free of charge, to any
|
||||
person obtaining a copy of this software and associated
|
||||
documentation files (the "Software"), to deal in the
|
||||
Software without restriction, including without
|
||||
limitation the rights to use, copy, modify, merge,
|
||||
publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software
|
||||
is furnished to do so, subject to the following
|
||||
conditions:
|
||||
|
||||
The above copyright notice and this permission notice
|
||||
shall be included in all copies or substantial portions
|
||||
of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
|
||||
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
|
||||
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
|
||||
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
||||
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
||||
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
<div align="center">
|
||||
|
||||
<h1><code>wasm-pack-template</code></h1>
|
||||
|
||||
<strong>A template for kick starting a Rust and WebAssembly project using <a href="https://github.com/rustwasm/wasm-pack">wasm-pack</a>.</strong>
|
||||
|
||||
<p>
|
||||
<a href="https://travis-ci.org/rustwasm/wasm-pack-template"><img src="https://img.shields.io/travis/rustwasm/wasm-pack-template.svg?style=flat-square" alt="Build Status" /></a>
|
||||
</p>
|
||||
|
||||
<h3>
|
||||
<a href="https://rustwasm.github.io/docs/wasm-pack/tutorials/npm-browser-packages/index.html">Tutorial</a>
|
||||
<span> | </span>
|
||||
<a href="https://discordapp.com/channels/442252698964721669/443151097398296587">Chat</a>
|
||||
</h3>
|
||||
|
||||
<sub>Built with 🦀🕸 by <a href="https://rustwasm.github.io/">The Rust and WebAssembly Working Group</a></sub>
|
||||
</div>
|
||||
|
||||
## About
|
||||
|
||||
[**📚 Read this template tutorial! 📚**][template-docs]
|
||||
|
||||
This template is designed for compiling Rust libraries into WebAssembly and
|
||||
publishing the resulting package to NPM.
|
||||
|
||||
Be sure to check out [other `wasm-pack` tutorials online][tutorials] for other
|
||||
templates and usages of `wasm-pack`.
|
||||
|
||||
[tutorials]: https://rustwasm.github.io/docs/wasm-pack/tutorials/index.html
|
||||
[template-docs]: https://rustwasm.github.io/docs/wasm-pack/tutorials/npm-browser-packages/index.html
|
||||
|
||||
## 🚴 Usage
|
||||
|
||||
### 🐑 Use `cargo generate` to Clone this Template
|
||||
|
||||
[Learn more about `cargo generate` here.](https://github.com/ashleygwilliams/cargo-generate)
|
||||
|
||||
```
|
||||
cargo generate --git https://github.com/rustwasm/wasm-pack-template.git --name my-project
|
||||
cd my-project
|
||||
```
|
||||
|
||||
### 🛠️ Build with `wasm-pack build`
|
||||
|
||||
```
|
||||
wasm-pack build
|
||||
```
|
||||
|
||||
### 🔬 Test in Headless Browsers with `wasm-pack test`
|
||||
|
||||
```
|
||||
wasm-pack test --headless --firefox
|
||||
```
|
||||
|
||||
### 🎁 Publish to NPM with `wasm-pack publish`
|
||||
|
||||
```
|
||||
wasm-pack publish
|
||||
```
|
||||
|
||||
## 🔋 Batteries Included
|
||||
|
||||
* [`wasm-bindgen`](https://github.com/rustwasm/wasm-bindgen) for communicating
|
||||
between WebAssembly and JavaScript.
|
||||
* [`console_error_panic_hook`](https://github.com/rustwasm/console_error_panic_hook)
|
||||
for logging panic messages to the developer console.
|
||||
* `LICENSE-APACHE` and `LICENSE-MIT`: most Rust projects are licensed this way, so these are included for you
|
||||
|
||||
## License
|
||||
|
||||
Licensed under either of
|
||||
|
||||
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
|
||||
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
|
||||
|
||||
at your option.
|
||||
|
||||
### Contribution
|
||||
|
||||
Unless you explicitly state otherwise, any contribution intentionally
|
||||
submitted for inclusion in the work by you, as defined in the Apache-2.0
|
||||
license, shall be dual licensed as above, without any additional terms or
|
||||
conditions.
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,15 @@
|
|||
use std::error::Error;
|
||||
|
||||
use cathode_ray::ray::load_ray;
|
||||
|
||||
fn main() -> Result<(), Box<dyn Error>> {
|
||||
tracing_subscriber::fmt::init();
|
||||
|
||||
let raw = include_bytes!("example.zip");
|
||||
|
||||
let ray = load_ray(raw.into());
|
||||
|
||||
dbg!(ray);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
mod utils;
|
||||
pub mod model;
|
||||
pub mod ray;
|
||||
|
||||
pub use ray::load_ray;
|
||||
|
|
@ -0,0 +1,134 @@
|
|||
|
||||
use serde::{Serialize, Deserialize};
|
||||
use wasm_bindgen::prelude::*;
|
||||
|
||||
#[wasm_bindgen]
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct UnpackedRay {
|
||||
pub(crate) expressions: Vec<Expression>,
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
impl UnpackedRay {
|
||||
#[wasm_bindgen(constructor)]
|
||||
pub fn new() -> Self {
|
||||
Self { expressions: vec![] }
|
||||
}
|
||||
|
||||
pub fn expr_len(&self) -> usize {
|
||||
self.expressions.len()
|
||||
}
|
||||
|
||||
pub fn get_expr(&self, index: usize) -> Option<Expression> {
|
||||
self.expressions.get(index).cloned()
|
||||
}
|
||||
|
||||
pub fn add_expr(&mut self, expr: Expression) -> usize {
|
||||
self.expressions.push(expr);
|
||||
self.expressions.len() - 1
|
||||
}
|
||||
|
||||
pub fn set_expr(&mut self, expr: Expression, index: usize) -> Result<(), String> {
|
||||
if index >= self.expressions.len() {
|
||||
return Err("Index out of bounds".to_string())
|
||||
}
|
||||
|
||||
self.expressions[index] = expr;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct Expression {
|
||||
pub(crate) frames: [Option<String>; 4],
|
||||
pub(crate) idle_anim: Option<String>,
|
||||
pub(crate) in_anim: Option<String>,
|
||||
pub(crate) out_anim: Option<String>,
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
impl Expression {
|
||||
#[wasm_bindgen(constructor)]
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn get_frame(&self, index: usize) -> Option<String> {
|
||||
if index > 3 {
|
||||
return None;
|
||||
}
|
||||
|
||||
self.frames
|
||||
.get(index)
|
||||
.map(|inner| inner.as_ref().cloned())
|
||||
.flatten()
|
||||
}
|
||||
|
||||
pub fn set_frame(&mut self, index: usize, data: String) -> Result<(), String> {
|
||||
if index > 3 {
|
||||
return Err("Frame index out of bounds".to_string())
|
||||
}
|
||||
|
||||
self.frames[index] = Some(data);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn get_idle(&self) -> Option<String> {
|
||||
self.idle_anim.clone()
|
||||
}
|
||||
|
||||
pub fn get_in(&self) -> Option<String> {
|
||||
self.in_anim.clone()
|
||||
}
|
||||
|
||||
pub fn get_out(&self) -> Option<String> {
|
||||
self.out_anim.clone()
|
||||
}
|
||||
|
||||
pub fn set_idle(&mut self, anim: &str) {
|
||||
self.idle_anim = Some(anim.to_string())
|
||||
}
|
||||
|
||||
pub fn set_in(&mut self, anim: &str) {
|
||||
self.in_anim = Some(anim.to_string())
|
||||
}
|
||||
|
||||
pub fn set_out(&mut self, anim: &str) {
|
||||
self.out_anim = Some(anim.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
#[serde(tag = "version")]
|
||||
pub(crate) enum Manifest {
|
||||
#[serde(rename = "1")]
|
||||
V1 {
|
||||
expressions: Vec<MetaExpr>
|
||||
}
|
||||
}
|
||||
|
||||
impl Manifest {
|
||||
pub fn add_expr(&mut self, exp: MetaExpr) {
|
||||
match self {
|
||||
Self::V1 { expressions } => expressions.push(exp)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Manifest {
|
||||
fn default() -> Self {
|
||||
Self::V1 { expressions: vec![] }
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct MetaExpr {
|
||||
pub frames: [Option<String>; 4],
|
||||
pub in_anim: Option<String>,
|
||||
pub out_anim: Option<String>,
|
||||
pub idle_anim: Option<String>
|
||||
}
|
||||
|
|
@ -0,0 +1,223 @@
|
|||
use crate::model::{Expression, Manifest, MetaExpr, UnpackedRay};
|
||||
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||
use std::io::{self, Cursor, Read, Seek, Write};
|
||||
use tracing::{debug, error};
|
||||
use wasm_bindgen::prelude::*;
|
||||
use zip::{write::FileOptions, ZipArchive, ZipWriter};
|
||||
|
||||
#[wasm_bindgen]
|
||||
pub fn load_ray(data: Vec<u8>) -> Option<UnpackedRay> {
|
||||
let buf = Cursor::new(data);
|
||||
let mut zf = ZipArchive::new(buf).ok()?;
|
||||
|
||||
// look for the ray.json file
|
||||
let file = match zf.by_name("ray.json") {
|
||||
Ok(file) => file,
|
||||
Err(e) => {
|
||||
error!("Unable to get ray.json from ray file: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
// read in the metadata
|
||||
let meta: Manifest = match serde_json::from_reader(file) {
|
||||
Ok(m) => m,
|
||||
Err(e) => {
|
||||
error!("Unable to parse ray file manifest: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
unpack_ray(zf, meta)
|
||||
}
|
||||
|
||||
fn unpack_ray<T: Read + Seek>(mut data: ZipArchive<T>, manifest: Manifest) -> Option<UnpackedRay> {
|
||||
debug!("Loading archive with manifest:\n{manifest:?}");
|
||||
|
||||
let mut ray = UnpackedRay::default();
|
||||
|
||||
match manifest {
|
||||
Manifest::V1 { expressions } => {
|
||||
for exp in expressions {
|
||||
let mut ray_expr = Expression::default();
|
||||
for (i, frame) in exp.frames.iter().enumerate() {
|
||||
if let Some(path) = frame {
|
||||
let mut file = match data.by_name(&path) {
|
||||
Ok(file) => file,
|
||||
Err(e) => {
|
||||
error!("Error get frame image from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
let mut buf = Vec::with_capacity(
|
||||
file.size().try_into().expect("Image size was too large"),
|
||||
);
|
||||
if let Err(e) = file.read_to_end(&mut buf) {
|
||||
error!("Error while reading image from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
|
||||
let raw = STANDARD.encode(buf);
|
||||
ray_expr.set_frame(i, raw).ok()?;
|
||||
}
|
||||
}
|
||||
if let Some(anim) = exp.idle_anim {
|
||||
let file = match data.by_name(&anim) {
|
||||
Ok(file) => file,
|
||||
Err(e) => {
|
||||
error!("Error get frame image from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
let raw = match io::read_to_string(file) {
|
||||
Ok(raw) => raw,
|
||||
Err(e) => {
|
||||
error!("Error reading image data from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
ray_expr.set_idle(&raw);
|
||||
}
|
||||
|
||||
if let Some(anim) = exp.in_anim {
|
||||
let file = match data.by_name(&anim) {
|
||||
Ok(file) => file,
|
||||
Err(e) => {
|
||||
error!("Error get frame image from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
let raw = match io::read_to_string(file) {
|
||||
Ok(raw) => raw,
|
||||
Err(e) => {
|
||||
error!("Error reading image data from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
ray_expr.set_in(&raw);
|
||||
}
|
||||
|
||||
if let Some(anim) = exp.out_anim {
|
||||
let file = match data.by_name(&anim) {
|
||||
Ok(file) => file,
|
||||
Err(e) => {
|
||||
error!("Error get frame image from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
let raw = match io::read_to_string(file) {
|
||||
Ok(raw) => raw,
|
||||
Err(e) => {
|
||||
error!("Error reading image data from archive: {e}");
|
||||
return None;
|
||||
}
|
||||
};
|
||||
|
||||
ray_expr.set_out(&raw);
|
||||
}
|
||||
|
||||
ray.add_expr(ray_expr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
debug!("Final loaded ray: {ray:#?}");
|
||||
|
||||
Some(ray)
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
pub fn save_ray(ray: &UnpackedRay) -> Result<Vec<u8>, String> {
|
||||
let mut manifest = Manifest::default();
|
||||
let mut file_counter = 0;
|
||||
let mut buf = vec![];
|
||||
{
|
||||
let mut zw = ZipWriter::new(Cursor::new(&mut buf));
|
||||
|
||||
for i in 0..ray.expr_len() {
|
||||
let mut meta_exp = MetaExpr::default();
|
||||
let exp = ray
|
||||
.get_expr(i)
|
||||
.ok_or_else(|| "Expceted expression was missing".to_string())?;
|
||||
|
||||
// write all the frames into the archive
|
||||
for f in 0..4 {
|
||||
let Some(raw) = exp.get_frame(f) else {
|
||||
meta_exp.frames[f] = None;
|
||||
continue;
|
||||
};
|
||||
let img = STANDARD.decode(raw).map_err(|e| e.to_string())?;
|
||||
|
||||
let name = file_counter.to_string();
|
||||
file_counter += 1;
|
||||
|
||||
zw.start_file(&name, FileOptions::default().compression_level(9.into()))
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
io::copy(&mut Cursor::new(img), &mut zw).map_err(|e| e.to_string())?;
|
||||
|
||||
meta_exp.frames[f] = Some(name);
|
||||
}
|
||||
|
||||
if let Some(anim) = exp.get_idle() {
|
||||
let name = file_counter.to_string();
|
||||
file_counter += 1;
|
||||
|
||||
zw.start_file(&name, FileOptions::default())
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
zw.write_all(anim.as_bytes()).map_err(|e| e.to_string())?;
|
||||
|
||||
meta_exp.idle_anim = name.into();
|
||||
|
||||
}
|
||||
|
||||
if let Some(anim) = exp.get_in() {
|
||||
let name = file_counter.to_string();
|
||||
file_counter += 1;
|
||||
|
||||
zw.start_file(&name, FileOptions::default())
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
zw.write_all(anim.as_bytes()).map_err(|e| e.to_string())?;
|
||||
|
||||
meta_exp.in_anim = name.into();
|
||||
|
||||
}
|
||||
|
||||
if let Some(anim) = exp.get_out() {
|
||||
let name = file_counter.to_string();
|
||||
file_counter += 1;
|
||||
|
||||
zw.start_file(&name, FileOptions::default())
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
zw.write_all(anim.as_bytes()).map_err(|e| e.to_string())?;
|
||||
|
||||
meta_exp.out_anim = name.into();
|
||||
|
||||
}
|
||||
|
||||
|
||||
manifest.add_expr(meta_exp);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
zw.start_file("ray.json", FileOptions::default())
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
serde_json::to_writer(&mut zw, &manifest).map_err(|e| e.to_string())?;
|
||||
|
||||
zw.finish().map_err(|e| e.to_string())?;
|
||||
}
|
||||
|
||||
Ok(buf)
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
pub fn set_panic_hook() {
|
||||
// When the `console_error_panic_hook` feature is enabled, we can call the
|
||||
// `set_panic_hook` function at least once during initialization, and then
|
||||
// we will get better error messages if our code ever panics.
|
||||
//
|
||||
// For more details see
|
||||
// https://github.com/rustwasm/console_error_panic_hook#readme
|
||||
#[cfg(feature = "console_error_panic_hook")]
|
||||
console_error_panic_hook::set_once();
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//! Test suite for the Web and headless browsers.
|
||||
|
||||
#![cfg(target_arch = "wasm32")]
|
||||
|
||||
extern crate wasm_bindgen_test;
|
||||
use wasm_bindgen_test::*;
|
||||
|
||||
wasm_bindgen_test_configure!(run_in_browser);
|
||||
|
||||
#[wasm_bindgen_test]
|
||||
fn pass() {
|
||||
assert_eq!(1 + 1, 2);
|
||||
}
|
||||
Loading…
Reference in New Issue