Moved shaders folder to root. Updated cargo.toml to include shaders f…

…older during publish.
ArjunNair · Mar 14, 2024 · 9b84594 · 9b84594
1 parent 7492805
commit 9b84594
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 repository = "https://github.com/ArjunNair/egui_sdl2_gl"
 categories = ["gui", "graphics"]
 keywords = ["sdl2", "opengl", "egui", "gui", "gamedev"]
-include = ["**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml", "/shaders"]
 
 [dependencies]
 ahash = "~0.8"

diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,9 @@
 
 NOTE: The major version number of this library matches that of the egui major version that this library currently supports. The minor version number may be different though. 
 
+# v0.26.2
+* Updated to egui v0.26 and refactored some stuff. Thanks [David Cohen](https://github.com/osimarr)
+
 # v0.23.0
 * Updated to egui v0.23.0
 * Fixed mix example throwing error due to Image api changes

diff --git a/src/shader/adaptive.frag → shaders/adaptive.frag b/src/shader/adaptive.frag → shaders/adaptive.frag
diff --git a/src/shader/adaptive.vert → shaders/adaptive.vert b/src/shader/adaptive.vert → shaders/adaptive.vert
diff --git a/src/shader/default.frag → shaders/default.frag b/src/shader/default.frag → shaders/default.frag
diff --git a/src/shader/default.vert → shaders/default.vert b/src/shader/default.vert → shaders/default.vert
diff --git a/src/painter.rs b/src/painter.rs
@@ -13,10 +13,10 @@ use gl::types::{GLchar, GLenum, GLint, GLsizeiptr, GLsync, GLuint};
 use std::convert::TryInto;
 use std::ffi::CString;
 
-const DEFAULT_VERT_SRC: &str = include_str!("shader/default.vert");
-const DEFAULT_FRAG_SRC: &str = include_str!("shader/default.frag");
-const ADAPTIVE_VERT_SRC: &str = include_str!("shader/adaptive.vert");
-const ADAPTIVE_FRAG_SRC: &str = include_str!("shader/adaptive.frag");
+const DEFAULT_VERT_SRC: &str = include_str!("../shaders/default.vert");
+const DEFAULT_FRAG_SRC: &str = include_str!("../shaders/default.frag");
+const ADAPTIVE_VERT_SRC: &str = include_str!("../shaders/adaptive.vert");
+const ADAPTIVE_FRAG_SRC: &str = include_str!("../shaders/adaptive.frag");
 
 #[derive(Default)]
 struct Texture {