me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some more imports/documentation.

Browse source
This commit is contained in:
shan 2022-10-06 19:41:00 -07:00
parent 72feba51be
commit f9a6efcaa0
12 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
glow/src/triangle/gradient.rs
View file

@ -22,8 +22,7 @@ pub struct GradientUniformData {
struct GradientUniformLocations {
gradient_direction_location: <Context as HasContext>::UniformLocation,
color_stops_size_location: <Context as HasContext>::UniformLocation,
//currently the maximum number of stops is 64 due to needing to allocate the
//memory for the array of stops with a const value in GLSL
//currently the maximum number of stops is 16 due to lack of SSBO in GL2.1
color_stops_location: <Context as HasContext>::UniformLocation,
transform_location: <Context as HasContext>::UniformLocation,
}
@ -140,7 +139,7 @@ impl GradientUniformData {
let transform_location =
unsafe { gl.get_uniform_location(program, "u_Transform") }
.expect("Get transform location.");
.expect("Gradient - Get u_Transform.");
GradientUniformData {
gradient: Gradient::Linear(Linear {

15
glow/src/triangle/solid.rs
View file

@ -25,12 +25,12 @@ impl SolidUniformData {
color_location: unsafe {
gl.get_uniform_location(program, "color")
}
.expect("Solid - Color uniform location."),
.expect("Solid - Get color."),
transform: Transformation::identity(),
transform_location: unsafe {
gl.get_uniform_location(program, "u_Transform")
}
.expect("Get transform location."),
.expect("Solid - Get u_Transform."),
}
}
}
@ -74,10 +74,13 @@ impl SolidProgram {
}
}
pub fn use_program(&mut self, gl: &Context, color: &Color, transform: &Transformation) {
unsafe {
gl.use_program(Some(self.program))
}
pub fn use_program(
&mut self,
gl: &Context,
color: &Color,
transform: &Transformation,
) {
unsafe { gl.use_program(Some(self.program)) }
self.write_uniforms(gl, color, transform)
}
}