From 9b8459435324a3603f04465c4b6c39be6d89d029 Mon Sep 17 00:00:00 2001
From: Arjun Nair <arjunair@gmail.com>
Date: Thu, 14 Mar 2024 13:05:12 +0530
Subject: [PATCH] Moved shaders folder to root. Updated cargo.toml to include
 shaders folder during publish.

---
 Cargo.toml                            | 2 +-
 changelog.md                          | 3 +++
 {src/shader => shaders}/adaptive.frag | 0
 {src/shader => shaders}/adaptive.vert | 0
 {src/shader => shaders}/default.frag  | 0
 {src/shader => shaders}/default.vert  | 0
 src/painter.rs                        | 8 ++++----
 7 files changed, 8 insertions(+), 5 deletions(-)
 rename {src/shader => shaders}/adaptive.frag (100%)
 rename {src/shader => shaders}/adaptive.vert (100%)
 rename {src/shader => shaders}/default.frag (100%)
 rename {src/shader => shaders}/default.vert (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 29f7086..9825f56 100644
--- 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
index fe0eda6..c40dac2 100644
--- 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 b/shaders/adaptive.frag
similarity index 100%
rename from src/shader/adaptive.frag
rename to shaders/adaptive.frag
diff --git a/src/shader/adaptive.vert b/shaders/adaptive.vert
similarity index 100%
rename from src/shader/adaptive.vert
rename to shaders/adaptive.vert
diff --git a/src/shader/default.frag b/shaders/default.frag
similarity index 100%
rename from src/shader/default.frag
rename to shaders/default.frag
diff --git a/src/shader/default.vert b/shaders/default.vert
similarity index 100%
rename from src/shader/default.vert
rename to shaders/default.vert
diff --git a/src/painter.rs b/src/painter.rs
index a020486..c19e848 100644
--- 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 {