Browse Source

move init/shutdown assimp to rendererInit/shutdown

testing
cinnaboot 6 years ago
parent
commit
7e9af05a7b
  1. 2
      examples/assimp_loading/main.cpp
  2. 4
      src/renderer.cpp

2
examples/assimp_loading/main.cpp

@ -62,7 +62,6 @@ main()
return 1; return 1;
} }
meInitAssimp();
// TODO: this needs to be more convenient // TODO: this needs to be more convenient
rs->render_groups = renAllocateGroup(1, *rs->default_shader); rs->render_groups = renAllocateGroup(1, *rs->default_shader);
rs->render_group_count = 1; rs->render_group_count = 1;
@ -98,7 +97,6 @@ main()
} }
renShutdown(rs); renShutdown(rs);
meShutdownAssimp();
return 0; return 0;
} }

4
src/renderer.cpp

@ -47,7 +47,8 @@ renInit(const char* title, glm::vec2 viewport_dims)
if (initSDL(rs->handles) && if (initSDL(rs->handles) &&
createWindow(title, rs->handles, rs->viewport_dims) && createWindow(title, rs->handles, rs->viewport_dims) &&
initContext(rs->handles) && initContext(rs->handles) &&
initGlOptions()) initGlOptions() &&
meInitAssimp())
{ {
rs->default_shader = rs->default_shader =
shaderInit(DEFAULT_VERTEX_SHADER, DEFAULT_FRAGMENT_SHADER); shaderInit(DEFAULT_VERTEX_SHADER, DEFAULT_FRAGMENT_SHADER);
@ -87,6 +88,7 @@ renShutdown(render_state* rs)
lightsOut(rs->lights); lightsOut(rs->lights);
utilSafeFree(rs->render_groups); utilSafeFree(rs->render_groups);
utilSafeFree(rs->default_shader); utilSafeFree(rs->default_shader);
meShutdownAssimp();
SDL_GL_DeleteContext(rs->handles.glContext); SDL_GL_DeleteContext(rs->handles.glContext);
SDL_DestroyWindow(rs->handles.window); SDL_DestroyWindow(rs->handles.window);
SDL_Quit(); SDL_Quit();

Loading…
Cancel
Save