diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-05-14 19:09:39 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-05-14 19:09:39 +0200 |
| commit | f6de2b1453930267015ab9323d5f83daa25667ba (patch) | |
| tree | 5ff586948f7ffe257f8f46919f01bd99c1ffb82a /src/graphic | |
| parent | 23ba151d95e4284ddb2d5f1c9810741061c293fd (diff) | |
| download | scop-f6de2b1453930267015ab9323d5f83daa25667ba.tar.gz scop-f6de2b1453930267015ab9323d5f83daa25667ba.tar.bz2 scop-f6de2b1453930267015ab9323d5f83daa25667ba.zip | |
Added ugly Cylindric UV mapping, texture/color transition
Diffstat (limited to 'src/graphic')
| -rw-r--r-- | src/graphic/event.c | 6 | ||||
| -rw-r--r-- | src/graphic/state.c | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/graphic/event.c b/src/graphic/event.c index c5986d4..ee20eab 100644 --- a/src/graphic/event.c +++ b/src/graphic/event.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/05/14 15:25:52 by charles #+# #+# */ -/* Updated: 2020/05/14 16:39:13 by charles ### ########.fr */ +/* Updated: 2020/05/14 18:49:43 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,6 +26,10 @@ static void st_handle_keydown(t_state *state, SDL_Keycode sym) state->polygon_mode = GL_FILL; GL_CALL(glPolygonMode(GL_FRONT_AND_BACK, state->polygon_mode)); } + else if (sym == SDLK_t) + { + state->transition = true; + } } static void st_handle_mousewheel(t_state *state, int y) diff --git a/src/graphic/state.c b/src/graphic/state.c index c3aaa8e..06569f8 100644 --- a/src/graphic/state.c +++ b/src/graphic/state.c @@ -6,12 +6,14 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/05/11 01:31:10 by charles #+# #+# */ -/* Updated: 2020/05/14 16:39:59 by charles ### ########.fr */ +/* Updated: 2020/05/14 19:02:56 by charles ### ########.fr */ /* */ /* ************************************************************************** */ #include "scop.h" +#define COLOR_RATIO_INC -0.02 + bool state_init(t_state *state, t_model_data *data) { if (SDL_Init(SDL_INIT_VIDEO) < 0) @@ -39,6 +41,8 @@ bool state_init(t_state *state, t_model_data *data) state->fov = M_PI_4; state->running = true; state->polygon_mode = GL_FILL; + state->transition = false; + state->is_texture = false; SDL_GL_GetDrawableSize(state->window, &state->width, &state->height); GL_CALL(glViewport(0, 0, state->width, state->height)); return (true); @@ -53,6 +57,16 @@ void state_run(t_state *state) rotation = M_PI_4; while (state->running) { + if (state->transition) + { + state->scene.color_ratio += (state->is_texture ? -1.0 : 1.0) * COLOR_RATIO_INC; + if ((!state->is_texture && state->scene.color_ratio <= 0.0) + || (state->is_texture && state->scene.color_ratio >= 1.0)) + { + state->transition = false; + state->is_texture = !state->is_texture; + } + } GL_CALL(glClearColor(0.1f, 0.1f, 0.1f, 1.0f)); GL_CALL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)); |