diff options
| -rw-r--r-- | Smoke/Week 2.suo | bin | 64512 -> 66048 bytes | |||
| -rw-r--r-- | Smoke/Week 2.vcproj | 10 | ||||
| -rw-r--r-- | Smoke/renderer_gl.c | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/Smoke/Week 2.suo b/Smoke/Week 2.suo Binary files differindex 613c8ba..6d38775 100644 --- a/Smoke/Week 2.suo +++ b/Smoke/Week 2.suo diff --git a/Smoke/Week 2.vcproj b/Smoke/Week 2.vcproj index 54a5b44..d9b7680 100644 --- a/Smoke/Week 2.vcproj +++ b/Smoke/Week 2.vcproj @@ -63,7 +63,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies=""gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib glu32.lib opengl32.lib user32.lib kernel32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdi32.lib imm32.lib shell32.lib ole32.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib cairo.lib pangoft2-1.0.lib fontconfig.lib freetype.lib z.lib pango-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib Glaux.lib"
+ AdditionalDependencies=""gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib glu32.lib opengl32.lib user32.lib kernel32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdi32.lib imm32.lib shell32.lib ole32.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib cairo.lib pangoft2-1.0.lib fontconfig.lib freetype.lib z.lib pango-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib"
OutputFile="$(OutDir)/Week 2.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="D:\GTK\lib"
@@ -974,19 +974,19 @@ >
</File>
<File
- RelativePath="fftw-2.1.3\fftw\Makefile.am"
+ RelativePath="fftw-2.1.3\rfftw\Makefile.am"
>
</File>
<File
- RelativePath="fftw-2.1.3\rfftw\Makefile.am"
+ RelativePath="fftw-2.1.3\fftw\Makefile.am"
>
</File>
<File
- RelativePath="fftw-2.1.3\rfftw\Makefile.in"
+ RelativePath="fftw-2.1.3\fftw\Makefile.in"
>
</File>
<File
- RelativePath="fftw-2.1.3\fftw\Makefile.in"
+ RelativePath="fftw-2.1.3\rfftw\Makefile.in"
>
</File>
<File
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c index 75c1514..795d4f2 100644 --- a/Smoke/renderer_gl.c +++ b/Smoke/renderer_gl.c @@ -337,9 +337,10 @@ GLuint LoadTextures(char *filename) glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); -// gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, width, height, GL_BGR, GL_UNSIGNED_BYTE, imagedata); + gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, width, height, GL_RGB, GL_UNSIGNED_BYTE, imagedata); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + return_value = texture; free(imagedata); } @@ -829,7 +830,7 @@ void renderer_init_gl(void) float LightDiffuse[] = { 0.50f, 0.50f, 0.50f, 0.00f }; // Diffuse light values float LightPosition[] = { -250.0f, -250.0f, -300.0f, 1.00f }; // Position of the light source - glEnable(GL_TEXTURE_2D); + //glEnable(GL_TEXTURE_2D); glShadeModel(GL_SMOOTH); glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); |