Casting improvements

zaplib/components/src/arrow_pointer.rs

@@ -21,6 +21,7 @@ impl ArrowPointerDirection {
     }
 }
 
+#[derive(Clone, Copy)]
 pub struct ArrowPointerIns {
     pub base: QuadIns,
     pub color: Vec4,

zaplib/components/src/background.rs

@@ -2,7 +2,7 @@
 
 use zaplib::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct BackgroundIns {
     quad: QuadIns,

zaplib/components/src/button.rs

@@ -9,7 +9,7 @@ pub enum ButtonEvent {
     Up,
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct BgIns {
     base: QuadIns,

zaplib/components/src/chart.rs

@@ -863,7 +863,7 @@ impl Chart {
                     &points,
                     dataset.point_background_color,
                     dataset.point_radius * current_dpi,
-                    dataset.point_style.clone(),
+                    dataset.point_style,
                 );
                 self.areas.push(area);
             }

zaplib/components/src/checkbox.rs

@@ -1,6 +1,6 @@
 use zaplib::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct CheckboxIns {
     base: QuadIns,

zaplib/components/src/drawlines3d.rs

@@ -1,7 +1,7 @@
 use zaplib::*;
 
 #[repr(C)]
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct DrawLines3dInstance {
     /// Starting point for the previous line segment. We use this to compute
     /// the corner between the previous line segment and the current one.

zaplib/components/src/drawpoints3d.rs

@@ -62,7 +62,7 @@ static SHADER: Shader = Shader {
 };
 
 #[repr(C)]
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct DrawPoints3dInstance {
     pub position: Vec3,
     pub color: Vec3,
@@ -80,7 +80,7 @@ struct DrawPoints3dUniforms {
     vertex_transform: Mat4,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub enum DrawPoints3dStyle {
     Quad,
     Circle,

zaplib/components/src/floatslider.rs

@@ -65,7 +65,7 @@ static KNOB_SHADER: Shader = Shader {
     ..Shader::DEFAULT
 };
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct FloatSliderIns {
     base: QuadIns,
@@ -106,7 +106,7 @@ const DEFAULT_BACKGROUND_RANGES: &[FloatSliderBackgroundRange] = &[FloatSliderBa
     height_pixels: 8.,
 }];
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct FloatSliderBackgroundRangeIns {
     base: QuadIns,

zaplib/components/src/foldcaption.rs

@@ -83,7 +83,7 @@ impl FoldOpenState {
     }
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct FoldCaptionIns {
     base: QuadIns,

zaplib/components/src/geometry3d.rs

@@ -3,6 +3,7 @@ use std::f32::consts::PI;
 use zaplib::*;
 
 /// Represents a single vertex used in 3d objects.
+#[derive(Clone, Copy)]
 #[repr(C)]
 pub struct Geometry3d {
     /// Vertex position.

zaplib/components/src/internal/desktopbutton.rs

@@ -24,7 +24,7 @@ impl DesktopButtonType {
     }
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct DesktopButtonIns {
     base: QuadIns,

zaplib/components/src/internal/scrollbar.rs

@@ -1,7 +1,7 @@
 use crate::{axis::*, ScrollBarConfig};
 use zaplib::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct ScrollBarIns {
     base: QuadIns,

zaplib/components/src/internal/tabclose.rs

@@ -1,7 +1,7 @@
 use crate::button::*;
 use zaplib::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct TabCloseIns {
     base: QuadIns,

zaplib/components/src/scrollshadow.rs

@@ -1,6 +1,6 @@
 use zaplib::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct ScrollShadowIns {
     base: QuadIns,

zaplib/components/src/tab.rs

@@ -2,7 +2,7 @@ use zaplib::*;
 
 use crate::{internal::tabclose::TabClose, ButtonEvent};
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct TabIns {
     base: QuadIns,

zaplib/components/src/texteditor.rs

@@ -169,7 +169,7 @@ static SHADER_MESSAGE_MARKER: Shader = Shader {
 /// drawn as the background by default. You pass in your own [`Shader`].
 ///
 /// Currently only used within [`TextEditor`].
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct ColorBackgroundIns {
     quad: QuadIns,
@@ -189,7 +189,7 @@ impl ColorBackground {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct IndentLinesIns {
     quad: QuadIns,
@@ -225,7 +225,7 @@ impl IndentLines {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 pub struct CursorIns {
     base: QuadIns,
@@ -258,7 +258,7 @@ impl Cursor {
     }
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 pub struct SelectionIns {
     base: QuadIns,

zaplib/docs/src/basic_api_overview.md

@@ -11,7 +11,7 @@ Some Rust functions, particularly around IO, don't work in WebAssembly out-of-th
 | [`println!`](https://doc.rust-lang.org/std/macro.println.html) | [`log!`](/target/doc/zaplib/macro.log.html) | Logs to the console (with line number). |
 | [`thread`](https://doc.rust-lang.org/std/thread/) | [`universal_thread`](/target/doc/zaplib/universal_thread/index.html) | <ul><li><code><a href="/target/doc/zaplib/universal_thread/fn.spawn.html">spawn</a></code> (without <code><a href="https://doc.rust-lang.org/std/thread/struct.JoinHandle.html">JoinHandle</a></code>)</li><li><code><a href="/target/doc/zaplib/universal_thread/fn.sleep.html">sleep</a></code></li><li>We recommend using a thread pool, e.g. the <a href="https://docs.rs/rayon/latest/rayon/struct.ThreadPoolBuilder.html#method.spawn_handler">rayon's <code>ThreadPoolBuilder</code></a>.</li></ul> |
 | [`Instant`](https://doc.rust-lang.org/std/time/struct.Instant.html) | [`UniversalInstant`](/target/doc/zaplib/universal_instant/struct.UniversalInstant.html) | `elapsed, now, duration_since, checked_add, checked_sub, +, -, +=, -=` |
-| [`File`](https://doc.rust-lang.org/std/thread/) | [`UniversalFile`](/target/doc/zaplib/universal_file/struct.UniversalFile.html) | <ul><li><code><a href="/target/doc/zaplib/universal_file/struct.UniversalFile.html#method.open">open</a></code> (on WebAssembly this blocks until the whole file is loaded in memory)</li><li><code><a href="/target/doc/zaplib/universal_file/struct.UniversalFile.html#method.open_url">open_url</a></code> (non-standard; load an absolute URL)</li><li><code><a href="/target/doc/zaplib/universal_file/struct.UniversalFile.html#method.clone">clone</a></code> (cheap; clones just a handle to the data; doesn't preserve cursor)</li><li><code><a href="https://doc.rust-lang.org/std/io/trait.Read.html">std::io::Read</a></code></li><li><code><a href="https://doc.rust-lang.org/std/io/trait.Seek.html">std::io::Seek</a></code></li><li><code><a href="/target/doc/zaplib/read_seek/trait.ReadSeek.html">ReadSeek</a></code> (non-standard; convenient trait for <code>Read + Seek</code>)</li></ul> |
+| [`File`](https://doc.rust-lang.org/stable/std/fs/struct.File.html) | [`UniversalFile`](/target/doc/zaplib/universal_file/struct.UniversalFile.html) | <ul><li><code><a href="/target/doc/zaplib/universal_file/struct.UniversalFile.html#method.open">open</a></code> (on WebAssembly this blocks until the whole file is loaded in memory)</li><li><code><a href="/target/doc/zaplib/universal_file/struct.UniversalFile.html#method.open_url">open_url</a></code> (non-standard; load an absolute URL)</li><li><code><a href="/target/doc/zaplib/universal_file/struct.UniversalFile.html#method.clone">clone</a></code> (cheap; clones just a handle to the data; doesn't preserve cursor)</li><li><code><a href="https://doc.rust-lang.org/std/io/trait.Read.html">std::io::Read</a></code></li><li><code><a href="https://doc.rust-lang.org/std/io/trait.Seek.html">std::io::Seek</a></code></li><li><code><a href="/target/doc/zaplib/read_seek/trait.ReadSeek.html">ReadSeek</a></code> (non-standard; convenient trait for <code>Read + Seek</code>)</li></ul> |
 | non-standard | [`universal_http_stream`](/target/doc/zaplib/universal_http_stream/index.html) | <ul><li><code><a href="/target/doc/zaplib/universal_http_stream/fn.request.html">request</a></code> (returns data as it comes in; useful for large files)</li><li><code><a href="https://doc.rust-lang.org/std/io/trait.Read.html">std::io::Read</a></code></li></ul> |
 | non-standard | [`universal_rand`](/target/doc/zaplib/universal_rand/index.html) | [`random_128`](/target/doc/zaplib/universal_rand/fn.random_128.html) |
 

zaplib/docs/src/tutorial_2d_rendering.md

@@ -58,7 +58,7 @@ Define a `SHADER` object:
 Define the struct to pass the color into the shader as an instance variable:
 
 ```rust,noplayground
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct RectIns {
     color: Vec4,
@@ -90,7 +90,7 @@ Now let's modify our example to draw 2 bordered rectangles of the given sizes on
 Modify `RectIns` to include the top-left position of rectangle and its size:
 
 ```rust,noplayground
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct RectIns {
     color: Vec4,

zaplib/examples/example_bigedit/src/codeicon.rs

@@ -1,6 +1,6 @@
 use zaplib::*;
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 pub struct CodeIconIns {
     base: QuadIns,

zaplib/examples/example_bigedit/src/colorpicker.rs

@@ -1,6 +1,6 @@
 use zaplib::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct ColorPickerIns {
     base: QuadIns,

zaplib/examples/example_bigedit/src/filetree.rs

@@ -2,7 +2,7 @@ use crate::listanims::*;
 use zaplib::*;
 use zaplib_components::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct FileTreeFillerIns {
     base: QuadIns,

zaplib/examples/example_lightning/src/main.rs

@@ -4,7 +4,7 @@ use zaplib_components::*;
 mod mprstokenizer;
 use mprstokenizer::*;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Copy, Default)]
 #[repr(C)]
 struct ShaderQuadIns {
     base: QuadIns,
@@ -264,7 +264,7 @@ impl LogoApp {
         self.quad.knobs_mirror[0] = vec2(1. - self.quad.knobs[0].x, self.quad.knobs[2].y);
         self.quad.knobs_mirror[2] = vec2(1. - self.quad.knobs[2].x, self.quad.knobs[0].y);
         self.quad.time = ((cx.last_event_time / ANIMATION_LENGTH) % 1.0) as f32;
-        *self.quad_area.get_first_mut(cx) = self.quad.clone();
+        *self.quad_area.get_first_mut(cx) = self.quad;
     }
 
     fn draw_shader(&mut self, cx: &mut Cx) {
@@ -285,7 +285,7 @@ impl LogoApp {
             cx.end_padding_box();
         }
         self.quad.base = QuadIns::from_rect(cx.get_box_rect()).with_draw_depth(1.0);
-        self.quad_area = cx.add_instances(&SHADER, &[self.quad.clone()]);
+        self.quad_area = cx.add_instances(&SHADER, &[self.quad]);
         self.update_shader(cx);
     }
 

zaplib/examples/example_shader/src/main.rs

@@ -1,7 +1,7 @@
 use zaplib::*;
 use zaplib_components::*;
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct ShaderQuadIns {
     base: QuadIns,
@@ -255,7 +255,7 @@ impl ShaderEditor {
         cx.move_draw_pos(cx.get_width_left() - quad_size, 0.);
         self.quad.base = QuadIns::from_rect(Rect { pos: cx.get_draw_pos(), size: vec2(quad_size, quad_size) });
 
-        self.quad_area = cx.add_instances(&SHADER, &[self.quad.clone()]);
+        self.quad_area = cx.add_instances(&SHADER, &[self.quad]);
 
         cx.end_row();
         self.main_view.end_view(cx);

zaplib/examples/test_many_quads/src/main.rs

@@ -16,7 +16,7 @@ static SHADER: Shader = Shader {
     ..Shader::DEFAULT
 };
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct CounterQuad {
     quad: QuadIns,

zaplib/examples/test_multithread/src/main.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use zaplib::*;
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct ColorQuad {
     base: QuadIns,

zaplib/examples/test_shader_2d_primitives/src/main.rs

@@ -85,14 +85,14 @@ static MAIN_SHADER: Shader = Shader {
     ..Shader::DEFAULT
 };
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct PrimitiveInsProps {
     primitive_type: f32,
     style: f32,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct PrimitiveIns {
     base: QuadIns,

zaplib/examples/tutorial_2d_rendering/step1/src/main.rs

@@ -1,5 +1,6 @@
 use zaplib::*;
 
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct RectIns {
     color: Vec4,

zaplib/examples/tutorial_2d_rendering/step2/src/main.rs

@@ -1,5 +1,6 @@
 use zaplib::*;
 
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct RectIns {
     color: Vec4,

zaplib/examples/tutorial_2d_rendering/step3/src/main.rs

@@ -1,5 +1,6 @@
 use zaplib::*;
 
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct RectIns {
     quad: QuadIns,

zaplib/examples/tutorial_3d_rendering/step3/src/main.rs

@@ -6,12 +6,14 @@ use zaplib::{
 };
 use zaplib_components::*;
 
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct Vertex {
     position: Vec3,
     normal: Vec3,
 }
 
+#[derive(Clone, Copy)]
 #[repr(C)]
 struct Instance {
     offset: f32,

zaplib/main/Cargo.toml

@@ -8,6 +8,9 @@ repository = "https://github.com/Zaplib/zaplib"
 readme = "README.md"
 description = "⚡ Zaplib is a fast, cross-platform (web+native), GPU-based application framework, written in Rust."
 
+[lib]
+doctest = false # They are mostly a pain to maintain for limited benefit. TODO(JP): Some day look into turning this back on?
+
 [features]
 disable-fonts=[]
 tls=["ureq/tls"] # TLS (for HTTPS) doesn't currently work with cross-compilation, so we allow disabling it.