projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add menu to opengl 3 demo. Should work as menu windows have their own classic context
[freeglut]
/
src
/
fg_geometry.c
diff --git
a/src/fg_geometry.c
b/src/fg_geometry.c
index
11bde1c
..
587501c
100644
(file)
--- a/
src/fg_geometry.c
+++ b/
src/fg_geometry.c
@@
-186,7
+186,7
@@
void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLfloat *textcs,
{
GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord;
GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal;
{
GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord;
GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal;
- GLint attribute_v_texture = -1; // TODO!!!
+ GLint attribute_v_texture = fgStructure.CurrentWindow->Window.attribute_v_texture;
if (fgStructure.CurrentWindow->State.VisualizeNormals)
/* generate normals for each vertex to be drawn as well */
if (fgStructure.CurrentWindow->State.VisualizeNormals)
/* generate normals for each vertex to be drawn as well */
@@
-557,7
+557,7
@@
static void fghDrawNormalVisualization11()
/* Done, free memory, reset color */
free(verticesForNormalVisualization);
/* Done, free memory, reset color */
free(verticesForNormalVisualization);
- glColor4fv(currentColor);
+ glColor4f(currentColor[0],currentColor[1],currentColor[2],currentColor[3]);
}
#endif
}
#endif