From c61f734a5b704d59f7b198b7f35d2e19c4da7f6e Mon Sep 17 00:00:00 2001
From: _ <_@_>
Date: Sun, 19 Dec 2021 01:23:00 +0000
Subject: [PATCH] make the boxes a little prettier

---
 Cargo.toml                |   3 +++
 cube.iqm                  | Bin 1672 -> 1672 bytes
 shaders/pumpkin-frag.glsl |   4 ++--
 src/bin/platformer.rs     |   6 ++++++
 src/texture.rs            |   4 ++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3cedbb8..97fff64 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,3 +32,6 @@ tracing = "0.1.22"
 tracing-subscriber = "0.2.15"
 
 inter_quake_model = {path = "../inter_quake_model"}
+
+[profile.dev.package."*"]
+opt-level = 3
diff --git a/cube.iqm b/cube.iqm
index e923f4fff47cfc9a40ec828977c75a09a9dac44b..6801b76c453da9be873c7136bb5cb2d2fc1c223e 100644
GIT binary patch
literal 1672
zcmb`HJxd%>6o#)~abpsVZq)pO^kFTG#f*YmNc<q8jgUGaX;X?b&4Q(fg@0p76HJ1Y
zU}0gCbT$bD8;h;9StjS1z3=YL64)K^z&q#bz2}^J2hPg+R(12u_R{O>+QxEq)eSo5
z_8-{CWZ1B47%-#;{O5*a!(+qy5$Em<_a)Rus4W>aW5{rAU=D;BbC&FbM#MX}0DOcP
zGhgR{^we$<dti6_%1MWL#X?P99ND2C2feUEj(CbocXPy(h9`tE>~0^PVqsqPKe<}H
zw(#-CUNn)W5&9-cBYV1-IQoT4qCY!xU&?8Qo^K>sRR54hzq7qu&)puJkQYz!!=q0p
z@Ls-MjHxra=-Qe-KYztBdDX34#WD32S0Bxz`KZHr)w9}OcpphGyH}n%;_#M|e(WM#
z{ipVsKJEawpE>@=QLKn=y~Frf<rRIiEXikVTzt-by_53tTQ_R=@%Jk3f4@w=roLzA
z-kpEboxgeKzBQYz83Vrmhwc6aeZ9HP7xUR)>?`djZ1xi?l$EP}g<Uc{G>jP@c^{kI
z_{1=7nD9RKQ^TZT%24(`_A|q@Va71)eQavcJ2RmdntABSocPRxhNqdsxMt%FT-^gM
SGgF70?n8Yz2zlbvp#NW(lp7@g

literal 1672
zcmchXOHRW;5JZPx2%kXsbDIbWFCsn>2=2fkSY*i&xD8v5k|VH#dUh9atQdKuh?dG#
zUGAA_kEI^pKNXJ;&sR6a-Q>EsP3tM8x1Jt~P2p8o6Q%<BrSLB73olzKeF>`y_9ocd
zu`RJ7%mn%%@aVIz2TZu`QwH?}9zD-WV>;4Td<bwIc=pX*-`DG{;U-3LrhRg2vpq9D
z+PS&ScdeN^1JBxwXFoKz<}=X_doba=%H~h|u5<0YqEfE&d*@!~yltK9yuM!7_HLQK
z%xmuH8t%{0Md#F(|0eF1bw2YiUB1icX<<*T`|rHoug~^9cFA4iJIT!#&X0ThJ-<Vq
zdtS4?nqSN-<`^Rh&3s~nGIC*N7P>F&2)n_1p_z>X;UM@h^iX^x90#9-J{6w{=fM}D
d+4nmm=*{KyhNgFzo?(Z-#d(wY7Q#Ng`~WIZ6aD}I

diff --git a/shaders/pumpkin-frag.glsl b/shaders/pumpkin-frag.glsl
index bc381b3..bb956fa 100644
--- a/shaders/pumpkin-frag.glsl
+++ b/shaders/pumpkin-frag.glsl
@@ -24,7 +24,7 @@ void main (void) {
 	
 	lowp vec3 sun = max (sun_factor, 0.0) * (vec3 (1.0) - sky_color);
 	lowp vec3 sky = (sky_factor * 0.5 + 0.5) * sky_color;
-	lowp vec3 diffuse_color = albedo * max (uni_min_bright, (sun + sky));
+	lowp vec3 diffuse_color = max (uni_min_bright, (sun + sky));
 	
-	gl_FragColor = vec4 (sqrt (diffuse_color), 1.0);
+	gl_FragColor = vec4 (albedo * sqrt (diffuse_color), 1.0);
 }
diff --git a/src/bin/platformer.rs b/src/bin/platformer.rs
index a9268e8..ea0098e 100644
--- a/src/bin/platformer.rs
+++ b/src/bin/platformer.rs
@@ -72,6 +72,7 @@ struct GameGraphics {
 	
 	text_stream: TriangleStream,
 	
+	texture_crate: Texture,
 	texture_sky: Texture,
 }
 
@@ -113,6 +114,8 @@ impl GameGraphics {
 			let attrs = shader_vars.attrs;
 			let unis = shader_vars.unis;
 			
+			self.texture_sky.bind ();
+			
 			{
 				let mvp = view_mat * 
 				Mat4::from_translation (state.player.pos) * 
@@ -124,6 +127,8 @@ impl GameGraphics {
 				});
 			}
 			
+			self.texture_crate.bind ();
+			
 			for aabb in &state.aabbs {
 				let min = aabb.min;
 				let max = aabb.max;
@@ -278,6 +283,7 @@ async fn main () -> Result <()> {
 		shader_lookup,
 		shaders,
 		text_stream,
+		texture_crate: Texture::from_file ("crate.png"),
 		texture_sky: Texture::from_file ("sky.png"),
 	};
 	
diff --git a/src/texture.rs b/src/texture.rs
index bc2d691..ad0888d 100644
--- a/src/texture.rs
+++ b/src/texture.rs
@@ -39,8 +39,8 @@ impl Texture {
 			
 			gl::TexParameteri (gl::TEXTURE_2D, gl::TEXTURE_WRAP_S, gl::CLAMP_TO_EDGE as i32);
 			gl::TexParameteri (gl::TEXTURE_2D, gl::TEXTURE_WRAP_T, gl::CLAMP_TO_EDGE as i32);
-			gl::TexParameteri (gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::LINEAR as i32);
-			gl::TexParameteri (gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR as i32);
+			gl::TexParameteri (gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::NEAREST as i32);
+			gl::TexParameteri (gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::NEAREST as i32);
 			
 			id
 		};