aboutsummaryrefslogtreecommitdiffstats
path: root/dev
diff options
context:
space:
mode:
authorKiet Tran <tran0563@umn.edu>2021-11-09 17:07:30 -0600
committerGitHub Enterprise <noreply-github@umn.edu>2021-11-09 17:07:30 -0600
commit99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e (patch)
tree801195b264e6d15cdf4ad02a2d00fd2320cea58c /dev
parentPublish a5 (diff)
downloadcsci4611-99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e.tar
csci4611-99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e.tar.gz
csci4611-99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e.tar.bz2
csci4611-99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e.tar.lz
csci4611-99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e.tar.xz
csci4611-99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e.tar.zst
csci4611-99b631a0a5cb3ae31bdbb3a45f57f3313bef8d6e.zip
Update artrender_app.cc to use toonDiffuse.png and toonSpecular.png
Diffstat (limited to 'dev')
-rw-r--r--dev/a5-artrender/artrender_app.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/a5-artrender/artrender_app.cc b/dev/a5-artrender/artrender_app.cc
index 87f014b..e0d24c7 100644
--- a/dev/a5-artrender/artrender_app.cc
+++ b/dev/a5-artrender/artrender_app.cc
@@ -165,10 +165,10 @@ void ArtRenderApp::LoadShadersAndTextures() {
// To try out different shading styles, you can replace diffuse.png and specular.png with
// some of the other texture files in the data/ directory.
- diffuse_ramp_.InitFromFile(Platform::FindFile("diffuse.png", search_path_));
+ diffuse_ramp_.InitFromFile(Platform::FindFile("toonDiffuse.png", search_path_));
diffuse_ramp_.set_wrap_mode(GL_CLAMP_TO_EDGE);
- specular_ramp_.InitFromFile(Platform::FindFile("specular.png", search_path_));
+ specular_ramp_.InitFromFile(Platform::FindFile("toonSpecular.png", search_path_));
specular_ramp_.set_wrap_mode(GL_CLAMP_TO_EDGE);
}