From c069c4efe367b7911d95801eb4aff6a26b3a6f32 Mon Sep 17 00:00:00 2001 From: trotFunky Date: Mon, 4 Nov 2019 15:20:20 +0100 Subject: [PATCH] Raptors now use display lists Updated submodule to get Camera fix --- libs/OpenGL-JIN | 2 +- src/main.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/OpenGL-JIN b/libs/OpenGL-JIN index 6209e91..10f7963 160000 --- a/libs/OpenGL-JIN +++ b/libs/OpenGL-JIN @@ -1 +1 @@ -Subproject commit 6209e91c2849dfb3294afa39fcd5a526b045c6ca +Subproject commit 10f7963fae47f4195048dc5519235dafdbe5e498 diff --git a/src/main.cpp b/src/main.cpp index dfcb930..8686957 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -89,11 +89,13 @@ int main(int argc, char** argv) ground.load_rgb_tga("resources/ground.tga"); wall.load_rgb_tga("resources/wall.tga"); out.load_rgb_tga("resources/Outside.tga"); + raptor.load_rgb_tga("resources/raptor.tga"); raptor_model.load_ascii_off_file("resources/raptor.off"); raptor_model.assign_texture(raptor); raptor_model.set_scaling(0.0025,0.0025,0.0025); raptor_model.set_rotation(-90,1,0,0); + raptor_model.prepare_displaylist(); maze = new Maze("resources/Map.tga", 2, ground, wall, out, raptor_model);