diff --git a/src/main.rs b/src/main.rs index e9fab66..049f037 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,7 +33,7 @@ fn main() { let mut render_timer = RenderTimer::new(); // 编译着色器 - let vs_src = std::ffi::CString::new(include_str!(".\\shaders\\vs.glsl")).unwrap_or_default(); + let vs_src = std::ffi::CString::new(include_str!(".\\shaders\\vs.vert")).unwrap_or_default(); println!("Vs Shader:\n{}", vs_src.to_str().unwrap_or_default()); let vs_ptr = vs_src.as_ptr() as *const i8; let vs = unsafe { gl::CreateShader(gl::VERTEX_SHADER) }; @@ -48,7 +48,7 @@ fn main() { println!("{}", from_utf8(&log_u8).unwrap()); } - let fs_src = std::ffi::CString::new(include_str!(".\\shaders\\fs.glsl")).unwrap_or_default(); + let fs_src = std::ffi::CString::new(include_str!(".\\shaders\\fs.frag")).unwrap_or_default(); println!("Fs Shader:\n{}", fs_src.to_str().unwrap_or_default()); let fs_ptr = fs_src.as_ptr() as *const i8; let fs = unsafe { gl::CreateShader(gl::FRAGMENT_SHADER) }; diff --git a/src/shaders/fs.glsl b/src/shaders/fs.frag similarity index 53% rename from src/shaders/fs.glsl rename to src/shaders/fs.frag index 5958017..5a532b8 100644 --- a/src/shaders/fs.glsl +++ b/src/shaders/fs.frag @@ -3,5 +3,5 @@ out vec4 FragColor; void main() { - FragColor = vec4(1.0, 0.2, 0.2, 1.0); + FragColor = vec4(0.0, 0.8824, 1.0, 1.0); } \ No newline at end of file diff --git a/src/shaders/vs.glsl b/src/shaders/vs.vert similarity index 100% rename from src/shaders/vs.glsl rename to src/shaders/vs.vert