Skip to content

Fixes for linux and mesa #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes for linux and mesa #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06b68ec
Don't use glGetString to get extension names - mesa doesn't like it.
stuaxo Aug 5, 2015
96dfd96
Tutorials 1 - 4
stuaxo Aug 5, 2015
29d3e1a
Merge branch 'master' of https://github.com/Jerdak/opengl_tutorials_p…
stuaxo Aug 5, 2015
d74fcb5
Fix slashes
stuaxo Aug 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions glew_wish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ def glewInit(unsafe=False):
global GLEW_OGL_INFO

GLEW_OGL_INFO = collections.defaultdict(list)
for name in (GL_VENDOR,GL_RENDERER,GL_VERSION,GL_SHADING_LANGUAGE_VERSION,GL_EXTENSIONS):
GLEW_OGL_INFO[name] = glGetString(name).decode().split(' ')
for name in (GL_VENDOR,GL_RENDERER,GL_VERSION,GL_SHADING_LANGUAGE_VERSION):
GLEW_OGL_INFO[name] = glGetString(name).decode().split(' ')

#It might be necessariy to use glGetStringi for extensions, so far glGetString has worked
#GLEW_OGL_INFO[GL_EXTENSIONS] = glGetStringi(GL_EXTENSIONS,<index>)

# unique-ify extensions in set making the 'in' operator
# O(1) average case.
GLEW_OGL_INFO[GL_EXTENSIONS] = set(GLEW_OGL_INFO[GL_EXTENSIONS])
#GLEW_OGL_INFO[GL_EXTENSIONS] = set(GLEW_OGL_INFO[GL_EXTENSIONS])

# opengl versions as of 2014
ogl_version_history = {
Expand Down
2 changes: 1 addition & 1 deletion objloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def main():
# #obj_parse_assignment["#"](c)
# print(c)

v,f,uv,n,c = load(".\\content\\suzanne.obj");
v,f,uv,n,c = load("Content/suzanne.obj")
v,uv,n = process_obj(v,f,uv,n,c)
print(v[0])
print(uv[0])
Expand Down
6 changes: 3 additions & 3 deletions tutorial1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ def main():
if not glfw.init():
return

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 01", None, None)

#
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 01", None, None)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
Expand Down
13 changes: 7 additions & 6 deletions tutorial10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 10", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 10", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -104,22 +105,22 @@ def main():
glBindVertexArray( vertex_array_id )

# Create and compile our GLSL program from the shaders
program_id = common.LoadShaders( ".\\shaders\\Tutorial10\\StandardShading.vertexshader",
".\\shaders\\Tutorial10\\StandardTransparentShading.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial10/StandardShading.vertexshader",
"Shaders/Tutorial10/StandardTransparentShading.fragmentshader" )

# Get a handle for our "MVP" uniform
matrix_id = glGetUniformLocation(program_id, "MVP")
view_matrix_id = glGetUniformLocation(program_id, "V")
model_matrix_id = glGetUniformLocation(program_id, "M")

# Load the texture
texture = textureutils.load_image(".\\content\\uvmap_suzanne.bmp")
texture = textureutils.load_image("Content/uvmap_suzanne.bmp")

# Get a handle for our "myTextureSampler" uniform
texture_id = glGetUniformLocation(program_id, "myTextureSampler")

# Read our OBJ file
vertices,faces,uvs,normals,colors = objloader.load(".\\content\\suzanne.obj")
vertices,faces,uvs,normals,colors = objloader.load("Content/suzanne.obj")
vertex_data,uv_data,normal_data = objloader.process_obj( vertices,faces,uvs,normals,colors)

# Our OBJ loader uses Python lists, convert to ctype arrays before sending to OpenGL
Expand Down
9 changes: 5 additions & 4 deletions tutorial2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 02", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 02", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -66,8 +67,8 @@ def main():
vertex_array_id = glGenVertexArrays(1)
glBindVertexArray( vertex_array_id )

program_id = common.LoadShaders( ".\\shaders\\Tutorial2\\SimpleVertexShader.vertexshader",
".\\shaders\\Tutorial2\\SimpleFragmentShader.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial2/SimpleVertexShader.vertexshader",
"Shaders/Tutorial2/SimpleFragmentShader.fragmentshader" )

vertex_data = [-1.0, -1.0, 0.0,
1.0, -1.0, 0.0,
Expand Down
9 changes: 5 additions & 4 deletions tutorial3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 03", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 03", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -71,8 +72,8 @@ def main():
vertex_array_id = glGenVertexArrays(1)
glBindVertexArray( vertex_array_id )

program_id = common.LoadShaders( ".\\shaders\\Tutorial3\\SimpleTransform.vertexshader",
".\\shaders\\Tutorial3\\SingleColor.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial3/SimpleTransform.vertexshader",
"Shaders/Tutorial3/SingleColor.fragmentshader" )

# Get a handle for our "MVP" uniform
matrix_id= glGetUniformLocation(program_id, "MVP");
Expand Down
14 changes: 10 additions & 4 deletions tutorial4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 04", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 04", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -84,8 +85,8 @@ def main():
vertex_array_id = glGenVertexArrays(1)
glBindVertexArray( vertex_array_id )

program_id = common.LoadShaders( ".\\shaders\\Tutorial4\\TransformVertexShader.vertexshader",
".\\shaders\\Tutorial4\\ColorFragmentShader.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial4/TransformVertexShader.vertexshader",
"Shaders/Tutorial4/ColorFragmentShader.fragmentshader" )

# Get a handle for our "MVP" uniform
matrix_id= glGetUniformLocation(program_id, "MVP");
Expand Down Expand Up @@ -196,6 +197,11 @@ def main():


while glfw.get_key(window,glfw.KEY_ESCAPE) != glfw.PRESS and not glfw.window_should_close(window):
# Enable depth test
glEnable(GL_DEPTH_TEST)
# Accept fragment if it closer to the camera than the former one
glDepthFunc(GL_LESS)

glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT)

glUseProgram(program_id)
Expand Down
11 changes: 6 additions & 5 deletions tutorial6.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 06", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 06", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -137,13 +138,13 @@ def main():
vertex_array_id = glGenVertexArrays(1)
glBindVertexArray( vertex_array_id )

program_id = common.LoadShaders( ".\\shaders\\Tutorial6\\TransformVertexShader.vertexshader",
".\\shaders\\Tutorial6\\TextureFragmentShader.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial6/TransformVertexShader.vertexshader",
"Shaders/Tutorial6/TextureFragmentShader.fragmentshader" )

# Get a handle for our "MVP" uniform
matrix_id = glGetUniformLocation(program_id, "MVP");

texture = load_image(".\\content\\uvtemplate.bmp")
texture = load_image("Content/uvtemplate.bmp")
texture_id = glGetUniformLocation(program_id, "myTextureSampler")

# Our vertices. Tree consecutive floats give a 3D vertex; Three consecutive vertices give a triangle.
Expand Down
13 changes: 7 additions & 6 deletions tutorial7.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 07", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 07", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -144,20 +145,20 @@ def main():
glBindVertexArray( vertex_array_id )

# Create and compile our GLSL program from the shaders
program_id = common.LoadShaders( ".\\shaders\\Tutorial7\\TransformVertexShader.vertexshader",
".\\shaders\\Tutorial7\\TextureFragmentShader.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial7/TransformVertexShader.vertexshader",
"Shaders/Tutorial7/TextureFragmentShader.fragmentshader" )

# Get a handle for our "MVP" uniform
matrix_id = glGetUniformLocation(program_id, "MVP")

# Load the texture
texture = load_image(".\\content\\uvmap.bmp")
texture = load_image("Content/uvmap.bmp")

# Get a handle for our "myTextureSampler" uniform
texture_id = glGetUniformLocation(program_id, "myTextureSampler")

# Read our OBJ file
vertices,faces,uvs,normals,colors = objloader.load(".\\content\\cube.obj")
vertices,faces,uvs,normals,colors = objloader.load("Content/cube.obj")
vertex_data,uv_data,normal_data = objloader.process_obj( vertices,faces,uvs,normals,colors)

# Our OBJ loader uses Python lists, convert to ctype arrays before sending to OpenGL
Expand Down
13 changes: 7 additions & 6 deletions tutorial8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 08", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 08", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -144,22 +145,22 @@ def main():
glBindVertexArray( vertex_array_id )

# Create and compile our GLSL program from the shaders
program_id = common.LoadShaders( ".\\shaders\\Tutorial8\\StandardShading.vertexshader",
".\\shaders\\Tutorial8\\StandardShading.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial8/StandardShading.vertexshader",
"Shaders/Tutorial8/StandardShading.fragmentshader" )

# Get a handle for our "MVP" uniform
matrix_id = glGetUniformLocation(program_id, "MVP")
view_matrix_id = glGetUniformLocation(program_id, "V")
model_matrix_id = glGetUniformLocation(program_id, "M")

# Load the texture
texture = load_image(".\\content\\uvmap_suzanne.bmp")
texture = load_image("Content/uvmap_suzanne.bmp")

# Get a handle for our "myTextureSampler" uniform
texture_id = glGetUniformLocation(program_id, "myTextureSampler")

# Read our OBJ file
vertices,faces,uvs,normals,colors = objloader.load(".\\content\\suzanne.obj")
vertices,faces,uvs,normals,colors = objloader.load("Content/suzanne.obj")
vertex_data,uv_data,normal_data = objloader.process_obj( vertices,faces,uvs,normals,colors)

# Our OBJ loader uses Python lists, convert to ctype arrays before sending to OpenGL
Expand Down
13 changes: 7 additions & 6 deletions tutorial9.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@ def opengl_init():
print("Failed to initialize GLFW\n",file=sys.stderr)
return False

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 09", None, None) #(in the accompanying source code this variable will be global)
glfw.window_hint(glfw.SAMPLES, 4)
glfw.window_hint(glfw.CONTEXT_VERSION_MAJOR, 3)
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, GL_TRUE)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)

# Open Window and create its OpenGL context
window = glfw.create_window(1024, 768, "Tutorial 09", None, None) #(in the accompanying source code this variable will be global)

if not window:
print("Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n",file=sys.stderr)
glfw.terminate()
Expand Down Expand Up @@ -104,22 +105,22 @@ def main():
glBindVertexArray( vertex_array_id )

# Create and compile our GLSL program from the shaders
program_id = common.LoadShaders( ".\\shaders\\Tutorial9\\StandardShading.vertexshader",
".\\shaders\\Tutorial9\\StandardShading.fragmentshader" )
program_id = common.LoadShaders( "Shaders/Tutorial9/StandardShading.vertexshader",
"Shaders/Tutorial9/StandardShading.fragmentshader" )

# Get a handle for our "MVP" uniform
matrix_id = glGetUniformLocation(program_id, "MVP")
view_matrix_id = glGetUniformLocation(program_id, "V")
model_matrix_id = glGetUniformLocation(program_id, "M")

# Load the texture
texture = textureutils.load_image(".\\content\\uvmap_suzanne.bmp")
texture = textureutils.load_image("Content/uvmap_suzanne.bmp")

# Get a handle for our "myTextureSampler" uniform
texture_id = glGetUniformLocation(program_id, "myTextureSampler")

# Read our OBJ file
vertices,faces,uvs,normals,colors = objloader.load(".\\content\\suzanne.obj")
vertices,faces,uvs,normals,colors = objloader.load("Content/suzanne.obj")
vertex_data,uv_data,normal_data = objloader.process_obj( vertices,faces,uvs,normals,colors)

# Our OBJ loader uses Python lists, convert to ctype arrays before sending to OpenGL
Expand Down