From 64b94f888047d1e064b4e47e49796f5066077d79 Mon Sep 17 00:00:00 2001 From: K4RP4T Date: Thu, 8 Feb 2024 02:44:34 +0100 Subject: [PATCH] aktualizacja tablic --- grk/cw 6/src/Planet.hpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/grk/cw 6/src/Planet.hpp b/grk/cw 6/src/Planet.hpp index b6d2966..7b2e2bd 100644 --- a/grk/cw 6/src/Planet.hpp +++ b/grk/cw 6/src/Planet.hpp @@ -28,18 +28,20 @@ Core::Shader_Loader shaderLoader; Core::RenderContext sphereContext; Core::RenderContext cubeContext; -const char* const planetTexPaths[] = { "./textures/planets/rocky.jpg", "./textures/planets/mercury.png", "./textures/planets/venus.jpg", "./textures/planets/earth.jpg", "./textures/planets/mars.jpg", - "./textures/planets/jupiter.jpg", "./textures/planets/saturn.jpg", "./textures/planets/uranus.jpg", "./textures/planets/neptune.jpg", "./textures/planets/icy.png", - "./textures/planets/volcanic.png", "./textures/planets/desert.png", "./textures/planets/tropical.png", "./textures/planets/toxic.jpg", "./textures/planets/swamp.png", - "./textures/planets/savannah.png", "./textures/planets/alpine.png", "./textures/planets/ceres.jpg", "./textures/planets/eris.jpg", "./textures/planets/haumea.jpg", - "./textures/planets/makemake.jpg" }; +const char* const planetTexPaths[] = { "./textures/planets/Alpine.jpg", "./textures/planets/ceres.jpg", "./textures/planets/denim.png", "./textures/planets/desert.png", "./textures/planets/dirty.png", + "./textures/planets/earth.jpg", "./textures/planets/eris.jpg", "./textures/planets/haumea.jpg", "./textures/planets/Icy.png", "./textures/planets/jupiter.jpg", "./textures/planets/kora.png", + "./textures/planets/leather.png", "./textures/planets/makemake.jpg", "./textures/planets/mars.jpg", "./textures/planets/mchowa.png", "./textures/planets/mercury.png", "./textures/planets/neptune.jpg", + "./textures/planets/saturn.jpg", "./textures/planets/Savannah.png", "./textures/planets/snow-foot.png", "./textures/planets/Swamp.png", "./textures/planets/toxic.jpg", "./textures/planets/Tropical.png", + "./textures/planets/uranus.jpg", "./textures/planets/venus.jpg", "./textures/planets/Volcanic.png", "./textures/planets/watermelon.png", "./textures/planets/wood.png" }; int planetTexIndex = 80; GLuint planetTex; -const char* const normalTexPaths[] = { "./textures/planets/normalne/rocky.png", "./textures/planets/normalne/beach.png", "./textures/planets/normalne/circles.png", "./textures/planets/normalne/denim.png", - "./textures/planets/normalne/dirty.png", "./textures/planets/normalne/kora.png", "./textures/planets/normalne/leather.png", "./textures/planets/normalne/mchowa.png", "./textures/planets/normalne/red_stone.png", - "./textures/planets/normalne/rocks.png", "./textures/planets/normalne/rust.png", "./textures/planets/normalne/snow-foot.png", "./textures/planets/normalne/swamp.png", "./textures/planets/normalne/toxic.png", - "./textures/planets/normalne/tropical.png", "./textures/planets/normalne/volcanic.png", "./textures/planets/normalne/watermelon.png", "./textures/planets/normalne/wood.png" }; +const char* const normalTexPaths[] = { "./textures/planets/normalne/alpine.png", "./textures/planets/normalne/ceres.png", "./textures/planets/normalne/denim.png", "./textures/planets/normalne/desert.png", + "./textures/planets/normalne/dirty.png", "./textures/planets/normalne/earth_normalmap.png", "./textures/planets/normalne/eris.png", "./textures/planets/normalne/haumea.png", "./textures/planets/normalne/icy.png", + "./textures/planets/normalne/jupiter.png", "./textures/planets/normalne/kora.png", "./textures/planets/normalne/leather.png", "./textures/planets/normalne/makemake.png", "./textures/planets/normalne/mars.png", + "./textures/planets/normalne/mchowa.png", "./textures/planets/normalne/mercury.png", "./textures/planets/normalne/neptune.jpg", "./textures/planets/normalne/saturn.png", "./textures/planets/normalne/savannah.png", + "./textures/planets/normalne/snow-foot.png", "./textures/planets/normalne/swamp.png", "./textures/planets/normalne/toxic.png", "./textures/planets/normalne/tropical.png", "./textures/planets/normalne/uranus.png", + "./textures/planets/normalne/venus.png", "./textures/planets/normalne/volcanic.png", "./textures/planets/normalne/watermelon.png", "./textures/planets/normalne/wood.png" }; int normalTexIndex = 80; GLuint normalTex;