Changeset 54b6d6b in opengl-game


Ignore:
Timestamp:
May 3, 2018, 3:17:21 AM (7 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
c58ebc3
Parents:
4e0b82b
Message:

Remove gl3w from the ImGui project and use glew instead

Files:
3 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • NewOpenGLGame.vcxproj

    r4e0b82b r54b6d6b  
    125125  </ItemDefinitionGroup>
    126126  <ItemGroup>
    127     <ClCompile Include="gl3w.c" />
    128127    <ClCompile Include="imgui.cpp" />
    129128    <ClCompile Include="imgui_demo.cpp" />
    … …  
    137136  </ItemGroup>
    138137  <ItemGroup>
    139     <ClInclude Include="gl3w.h" />
    140     <ClInclude Include="glcorearb.h" />
    141138    <ClInclude Include="imgui_internal.h" />
    142139    <ClInclude Include="imgui_impl_glfw_gl3.h" />

  • imgui_example.cpp

    r4e0b82b r54b6d6b  
    22// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
    33// (GLFW is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.)
    4 // (GL3W is a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc.)
    54
    65#include "imgui.h"
    76#include "imgui_impl_glfw_gl3.h"
    87#include <stdio.h>
    9 #include "gl3w.h"    // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.
     8
     9#include <GL/glew.h>
    1010#include <GLFW/glfw3.h>
    1111
    … …  
    3030   glfwMakeContextCurrent(window);
    3131   glfwSwapInterval(1); // Enable vsync
    32    gl3wInit();
     32
     33   glewExperimental = GL_TRUE;
     34   glewInit();
    3335
    3436   // Setup Dear ImGui binding

  • imgui_impl_glfw_gl3.cpp

    r4e0b82b r54b6d6b  
    11// ImGui GLFW binding with OpenGL3 + shaders
    22// (GLFW is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.)
    3 // (GL3W is a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc.)
    43
    54// Implemented features:
    … …  
    4140#include "imgui_impl_glfw_gl3.h"
    4241
    43 // GL3W/GLFW
    44 #include "gl3w.h"    // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.
     42// GLEW/GLFW
     43#include <GL/glew.h>
    4544#include <GLFW/glfw3.h>
    4645#ifdef _WIN32

  • imgui_impl_glfw_gl3.h

    r4e0b82b r54b6d6b  
    11// ImGui GLFW binding with OpenGL3 + shaders
    22// (GLFW is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.)
    3 // (GL3W is a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc.)
    43
    54// Implemented features:
Note: See TracChangeset for help on using the changeset viewer.