moved gl_wrapper to its own crate

TheNumerus · Dec 5, 2022 · 90d4cb7 · 90d4cb7
1 parent ac0af2f
commit 90d4cb7
Show file tree

Hide file tree

Showing 37 changed files with 67 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,41 +1,6 @@
-[package]
-name = "blackhole"
-version = "0.1.0"
-edition = "2021"
+[workspace]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bin]]
-name = "blackhole"
-path = "src/bin/blackhole/main.rs"
-
-[[bin]]
-name = "blackhole-cli"
-path = "src/bin/blackhole/main-cli.rs"
-
-[dependencies]
-png = "0.17"
-cgmath = { version = "0.18", features = ["swizzle"] }
-rand = { version = "0.8", features = ["small_rng"] }
-rayon = "1.5"
-clap = { version = "4.0.10", features = ["derive"] }
-once_cell = "1.16.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-json5 = "0.4.1"
-winit = "0.27.5"
-glutin = "0.30.2"
-glutin-winit = "0.2.1"
-raw-window-handle = "0.5.0"
-gl = "0.14.0"
-thiserror = "1.0.37"
-
-[dev-dependencies]
-criterion = "0.4.0"
+members = ["blackhole", "gl_wrapper"]
 
 [profile.release]
-debug = true
-
-[[bench]]
-name = "dist_fn"
-harness = false
+debug = true
diff --git a/blackhole/Cargo.toml b/blackhole/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "blackhole"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[[bin]]
+name = "blackhole"
+path = "src/bin/blackhole/main.rs"
+
+[[bin]]
+name = "blackhole-cli"
+path = "src/bin/blackhole/main-cli.rs"
+
+[dependencies]
+png = "0.17"
+cgmath = { version = "0.18", features = ["swizzle"] }
+rand = { version = "0.8", features = ["small_rng"] }
+rayon = "1.5"
+clap = { version = "4.0.10", features = ["derive"] }
+once_cell = "1.16.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+json5 = "0.4.1"
+winit = "0.27.5"
+glutin = "0.30.2"
+glutin-winit = "0.2.1"
+raw-window-handle = "0.5.0"
+gl = "0.14.0"
+gl_wrapper = {path = "../gl_wrapper"}
+thiserror = "1.0.37"
+
+[dev-dependencies]
+criterion = "0.4.0"
+
+[[bench]]
+name = "dist_fn"
+harness = false
diff --git a/benches/dist_fn.rs → blackhole/benches/dist_fn.rs b/benches/dist_fn.rs → blackhole/benches/dist_fn.rs
diff --git a/src/bin/blackhole/args.rs → blackhole/src/bin/blackhole/args.rs b/src/bin/blackhole/args.rs → blackhole/src/bin/blackhole/args.rs
diff --git a/src/bin/blackhole/gl_shaders/output.glsl → .../src/bin/blackhole/gl_shaders/output.glsl b/src/bin/blackhole/gl_shaders/output.glsl → .../src/bin/blackhole/gl_shaders/output.glsl
diff --git a/src/bin/blackhole/gl_shaders/quad.glsl → ...le/src/bin/blackhole/gl_shaders/quad.glsl b/src/bin/blackhole/gl_shaders/quad.glsl → ...le/src/bin/blackhole/gl_shaders/quad.glsl
diff --git a/src/bin/blackhole/main-cli.rs → blackhole/src/bin/blackhole/main-cli.rs b/src/bin/blackhole/main-cli.rs → blackhole/src/bin/blackhole/main-cli.rs
@@ -9,7 +9,6 @@ use blackhole::filter::BlackmanHarrisFilter;
 use blackhole::framebuffer::{FrameBuffer, Pixel};
 
 mod args;
-mod gl_wrapper;
 mod renderer;
 mod scene_loader;
 mod shaders;

diff --git a/src/bin/blackhole/main.rs → blackhole/src/bin/blackhole/main.rs b/src/bin/blackhole/main.rs → blackhole/src/bin/blackhole/main.rs
@@ -22,17 +22,17 @@ use winit::window::{Window, WindowBuilder};
 use blackhole::filter::BlackmanHarrisFilter;
 use blackhole::framebuffer::FrameBuffer;
 
+use gl_wrapper::geometry::{GeometryBuilder, VertexAttribute};
+use gl_wrapper::program::ProgramBuilder;
+use gl_wrapper::renderer::GlRenderer;
+use gl_wrapper::texture::{Texture2D, TextureFormats};
+use gl_wrapper::QUAD;
+
 mod args;
-mod gl_wrapper;
 mod renderer;
 mod scene_loader;
 mod shaders;
 
-use crate::gl_wrapper::geometry::{GeometryBuilder, VertexAttribute};
-use crate::gl_wrapper::program::ProgramBuilder;
-use crate::gl_wrapper::renderer::GlRenderer;
-use crate::gl_wrapper::texture::{Texture2D, TextureFormats};
-use crate::gl_wrapper::QUAD;
 use crate::renderer::{RenderInMsg, RenderOutMsg};
 use args::Args;
 use blackhole::frame::{Frame, Region};

diff --git a/src/bin/blackhole/renderer.rs → blackhole/src/bin/blackhole/renderer.rs b/src/bin/blackhole/renderer.rs → blackhole/src/bin/blackhole/renderer.rs
diff --git a/src/bin/blackhole/scene_loader.rs → blackhole/src/bin/blackhole/scene_loader.rs b/src/bin/blackhole/scene_loader.rs → blackhole/src/bin/blackhole/scene_loader.rs
diff --git a/src/bin/blackhole/shaders.rs → blackhole/src/bin/blackhole/shaders.rs b/src/bin/blackhole/shaders.rs → blackhole/src/bin/blackhole/shaders.rs
diff --git a/src/bin/blackhole/shaders/star_sky.rs → ...ole/src/bin/blackhole/shaders/star_sky.rs b/src/bin/blackhole/shaders/star_sky.rs → ...ole/src/bin/blackhole/shaders/star_sky.rs
diff --git a/src/camera.rs → blackhole/src/camera.rs b/src/camera.rs → blackhole/src/camera.rs
diff --git a/src/filter.rs → blackhole/src/filter.rs b/src/filter.rs → blackhole/src/filter.rs
diff --git a/src/frame.rs → blackhole/src/frame.rs b/src/frame.rs → blackhole/src/frame.rs
diff --git a/src/framebuffer.rs → blackhole/src/framebuffer.rs b/src/framebuffer.rs → blackhole/src/framebuffer.rs
diff --git a/src/lib.rs → blackhole/src/lib.rs b/src/lib.rs → blackhole/src/lib.rs
diff --git a/src/lut.rs → blackhole/src/lut.rs b/src/lut.rs → blackhole/src/lut.rs
diff --git a/src/material.rs → blackhole/src/material.rs b/src/material.rs → blackhole/src/material.rs
diff --git a/src/math.rs → blackhole/src/math.rs b/src/math.rs → blackhole/src/math.rs
diff --git a/src/object.rs → blackhole/src/object.rs b/src/object.rs → blackhole/src/object.rs
diff --git a/src/object/aabb.rs → blackhole/src/object/aabb.rs b/src/object/aabb.rs → blackhole/src/object/aabb.rs
diff --git a/src/object/distortion.rs → blackhole/src/object/distortion.rs b/src/object/distortion.rs → blackhole/src/object/distortion.rs
diff --git a/src/object/shape.rs → blackhole/src/object/shape.rs b/src/object/shape.rs → blackhole/src/object/shape.rs
diff --git a/src/object/shape/composite.rs → blackhole/src/object/shape/composite.rs b/src/object/shape/composite.rs → blackhole/src/object/shape/composite.rs
diff --git a/src/object/shape/cylinder.rs → blackhole/src/object/shape/cylinder.rs b/src/object/shape/cylinder.rs → blackhole/src/object/shape/cylinder.rs
diff --git a/src/object/shape/sphere.rs → blackhole/src/object/shape/sphere.rs b/src/object/shape/sphere.rs → blackhole/src/object/shape/sphere.rs
diff --git a/src/scene.rs → blackhole/src/scene.rs b/src/scene.rs → blackhole/src/scene.rs
diff --git a/src/shader.rs → blackhole/src/shader.rs b/src/shader.rs → blackhole/src/shader.rs
diff --git a/src/texture.rs → blackhole/src/texture.rs b/src/texture.rs → blackhole/src/texture.rs
diff --git a/gl_wrapper/Cargo.toml b/gl_wrapper/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "gl_wrapper"
+version = "0.0.0"
+edition = "2021"
+
+[dependencies]
+gl = "0.14.0"
+thiserror = "1.0.37"
diff --git a/src/bin/blackhole/gl_wrapper/geometry.rs → gl_wrapper/src/geometry.rs b/src/bin/blackhole/gl_wrapper/geometry.rs → gl_wrapper/src/geometry.rs
diff --git a/src/bin/blackhole/gl_wrapper.rs → gl_wrapper/src/lib.rs b/src/bin/blackhole/gl_wrapper.rs → gl_wrapper/src/lib.rs
diff --git a/src/bin/blackhole/gl_wrapper/program.rs → gl_wrapper/src/program.rs b/src/bin/blackhole/gl_wrapper/program.rs → gl_wrapper/src/program.rs
diff --git a/src/bin/blackhole/gl_wrapper/renderer.rs → gl_wrapper/src/renderer.rs b/src/bin/blackhole/gl_wrapper/renderer.rs → gl_wrapper/src/renderer.rs
@@ -1,5 +1,5 @@
-use crate::gl_wrapper::geometry::Geometry;
-use crate::gl_wrapper::program::Program;
+use crate::geometry::Geometry;
+use crate::program::Program;
 
 pub struct GlRenderer {
     current_program: u32,

diff --git a/src/bin/blackhole/gl_wrapper/texture.rs → gl_wrapper/src/texture.rs b/src/bin/blackhole/gl_wrapper/texture.rs → gl_wrapper/src/texture.rs