Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-06 01:03:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Now loads PNGs as textures (test texture load in the corner)

Browse source
This commit is contained in:
Yoz Grahame 2012-11-05 16:52:45 -08:00
parent cabcbbc0d2
commit 6cdba406e1
11 changed files with 8033 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
field.cpp
View file

@ -97,7 +97,8 @@ void field_simulate(float dt) {
field[i].val.z*field[i].val.z, 0.5);
neighbors *= 0.0001;
glm::vec3 test = glm::normalize(glm::vec3(0,0,0));
// not currently in use
// glm::vec3 test = glm::normalize(glm::vec3(0,0,0));
field[i].val = glm::normalize(field[i].val);
field[i].val *= size * 0.99;

BIN
images/philip-image.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 46 KiB

BIN
images/pngtest8rgba.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

52
interface.xcodeproj/project.pbxproj
View file

@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
8DD76F650486A84900D96B5E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* main.cpp */; settings = {ATTRIBUTES = (); }; };
8DD76F6A0486A84900D96B5E /* test_c_plus.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E8B029090EE04C91782 /* test_c_plus.1 */; };
B6BDADD415F4085B002A07DF /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6BDADD315F4085B002A07DF /* audio.cpp */; };
B6BDADD615F40B04002A07DF /* libportaudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BDADD515F40B04002A07DF /* libportaudio.a */; };
B6BDADE115F44A9D002A07DF /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BDADDE15F444DB002A07DF /* CoreServices.framework */; };
@ -24,18 +23,23 @@
D4EE3BC215E761B000EE4C89 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4EE3BC115E761B000EE4C89 /* util.cpp */; };
D4EE3BC615EBD93600EE4C89 /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4EE3BC515EBD93400EE4C89 /* network.cpp */; };
D4EFE3D0162A2DA000DC5C59 /* hand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4EFE3CF162A2DA000DC5C59 /* hand.cpp */; };
F68135561648617D003040E3 /* texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F68135541648617D003040E3 /* texture.cpp */; };
F68135691648830D003040E3 /* pngtest8rgba.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = F681356816487A7F003040E3 /* pngtest8rgba.png */; };
F681356E16488470003040E3 /* philip-image.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = F681356D1648846A003040E3 /* philip-image.png */; };
F681358B1648896D003040E3 /* lodepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F681358A1648896D003040E3 /* lodepng.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
8DD76F690486A84900D96B5E /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 8;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
buildActionMask = 12;
dstPath = "";
dstSubfolderSpec = 16;
files = (
8DD76F6A0486A84900D96B5E /* test_c_plus.1 in CopyFiles */,
F681356E16488470003040E3 /* philip-image.png in CopyFiles */,
F68135691648830D003040E3 /* pngtest8rgba.png in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
@ -67,6 +71,12 @@
D4EE3BC515EBD93400EE4C89 /* network.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = network.cpp; sourceTree = "<group>"; };
D4EFE3CE162A2D7300DC5C59 /* hand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hand.h; sourceTree = "<group>"; };
D4EFE3CF162A2DA000DC5C59 /* hand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hand.cpp; sourceTree = "<group>"; };
F68135541648617D003040E3 /* texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = texture.cpp; sourceTree = "<group>"; };
F68135551648617D003040E3 /* texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = texture.h; sourceTree = "<group>"; };
F681356816487A7F003040E3 /* pngtest8rgba.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pngtest8rgba.png; sourceTree = "<group>"; };
F681356D1648846A003040E3 /* philip-image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "philip-image.png"; sourceTree = "<group>"; };
F681358A1648896D003040E3 /* lodepng.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lodepng.cpp; sourceTree = "<group>"; };
F681358C16488978003040E3 /* lodepng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lodepng.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -90,6 +100,7 @@
08FB7794FE84155DC02AAC07 /* test_c_plus */ = {
isa = PBXGroup;
children = (
F6813566164879B5003040E3 /* Resources */,
B6BDADDE15F444DB002A07DF /* CoreServices.framework */,
B6BDADDC15F444D3002A07DF /* AudioUnit.framework */,
B6BDADDA15F444C9002A07DF /* AudioToolbox.framework */,
@ -125,6 +136,10 @@
D4EE3BC315E7625000EE4C89 /* util.h */,
B6BDADD115F4084F002A07DF /* audio.h */,
B6BDADD315F4085B002A07DF /* audio.cpp */,
F68135541648617D003040E3 /* texture.cpp */,
F68135551648617D003040E3 /* texture.h */,
F681358A1648896D003040E3 /* lodepng.cpp */,
F681358C16488978003040E3 /* lodepng.h */,
);
name = Source;
sourceTree = "<group>";
@ -145,6 +160,23 @@
name = Documentation;
sourceTree = "<group>";
};
F6813566164879B5003040E3 /* Resources */ = {
isa = PBXGroup;
children = (
F681356716487A7F003040E3 /* images */,
);
name = Resources;
sourceTree = "<group>";
};
F681356716487A7F003040E3 /* images */ = {
isa = PBXGroup;
children = (
F681356D1648846A003040E3 /* philip-image.png */,
F681356816487A7F003040E3 /* pngtest8rgba.png */,
);
path = images;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -207,6 +239,8 @@
B6BDAE4415F6BE53002A07DF /* particle.cpp in Sources */,
D4B96D4915FF967C00CE6E8B /* head.cpp in Sources */,
D4EFE3D0162A2DA000DC5C59 /* hand.cpp in Sources */,
F68135561648617D003040E3 /* texture.cpp in Sources */,
F681358B1648896D003040E3 /* lodepng.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -222,12 +256,13 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
"HEADER_SEARCH_PATHS[arch=*]" = /Users/philip/Desktop/automata/portaudio/include;
HEADER_SEARCH_PATHS = /usr/local/include;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
/usr/local/lib,
/usr/local/Cellar/libpng/1.5.13/lib,
);
OTHER_CPLUSPLUSFLAGS = (
"-O3",
@ -244,12 +279,13 @@
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
"HEADER_SEARCH_PATHS[arch=*]" = /Users/philip/Desktop/automata/portaudio/include;
HEADER_SEARCH_PATHS = /usr/local/include;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
/usr/local/lib,
/usr/local/Cellar/libpng/1.5.13/lib,
);
OTHER_CPLUSPLUSFLAGS = (
"-O3",

6208
lodepng.cpp Normal file
View file

File diff suppressed because it is too large Load diff

1656
lodepng.h Normal file
View file

File diff suppressed because it is too large Load diff

44
main.cpp
View file

@ -45,6 +45,8 @@
#include "hand.h"
#include "particle.h"
#include "texture.h"
//TGAImg Img;
using namespace std;
@ -190,8 +192,7 @@ timeval timer_start, timer_end;
timeval last_frame;
double elapsedTime;
// Every second, check the frame rates and other stuff
// Every second, check the frame rates and other stuff
void Timer(int extra)
{
gettimeofday(&timer_end, NULL);
@ -589,17 +590,40 @@ void display(void)
glRotatef(render_yaw, 0, 1, 0);
glTranslatef(location[0], location[1], location[2]);
glEnable(GL_DEPTH_TEST);
//glEnable(GL_DEPTH_TEST);
// TEST: Draw a reference object in world space coordinates!
glPushMatrix();
glTranslatef(1,0,0);
//glPushMatrix();
// glTranslatef(1,0,0);
//glTranslatef(myHead.getPos().x, myHead.getPos().y, myHead.getPos().z);
glColor3f(1,0,0);
glutSolidCube(0.4);
glPopMatrix();
// glColor3f(1,0,0);
// glutSolidCube(0.4);
//glPopMatrix();
// TEST: Draw a textured square (Yoz)
/* create a square on the XY
note that OpenGL origin is at the lower left
but texture origin is at upper left
=> it has to be mirrored */
char texture_filename[] = "pngtest8rgba.png";
unsigned int texture_width = 91;
unsigned int texture_height = 69;
int error = load_png_as_texture(texture_filename, texture_width, texture_height);
glEnable(GL_TEXTURE_2D);
glBegin(GL_QUADS);
glNormal3f(0.0, 0.0, 1.0);
glTexCoord2d(1, 1); glVertex3f(0.0, 0.0, 0.0);
glTexCoord2d(1, 0); glVertex3f(0.0, 2.0, 0.0);
glTexCoord2d(0, 0); glVertex3f(1.0, 2.0, 0.0);
glTexCoord2d(0, 1); glVertex3f(1.0, 0.0, 0.0);
glEnd();
glDisable(GL_TEXTURE_2D);
// Draw Triangles
// Draw Triangles
glBegin(GL_TRIANGLES);
for (i = 0; i < NUM_TRIS; i++)
{

BIN
philip-image.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 46 KiB

BIN
pngtest8rgba.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

68
texture.cpp Normal file
View file

@ -0,0 +1,68 @@
//
// texture.cpp
// interface
//
// Added by Yoz on 11/5/12.
//
// Code lifted from http://en.wikibooks.org/wiki/OpenGL_Programming/Intermediate/Textures
#include "texture.h"
#ifdef __APPLE__
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#endif
#include "lodepng.h"
#include <vector>
#include <cstdio>
#define TEXTURE_LOAD_ERROR 0
int load_png_as_texture(char* filename, unsigned int width, unsigned int height)
{
std::vector<unsigned char> image;
unsigned error = lodepng::decode(image, width, height, filename);
if (error) {
return (int) error;
}
// Make some OpenGL properties better for 2D and enable alpha channel.
glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
glEnable(GL_ALPHA_TEST);
if(glGetError() != GL_NO_ERROR)
{
std::cout << "Error initing GL" << std::endl;
return 1;
}
// Texture size must be power of two for the primitive OpenGL version this is written for. Find next power of two.
size_t u2 = 1; while(u2 < width) u2 *= 2;
size_t v2 = 1; while(v2 < height) v2 *= 2;
// Ratio for power of two version compared to actual version, to render the non power of two image with proper size.
// double u3 = (double)width / u2;
// double v3 = (double)height / v2;
// Make power of two version of the image.
std::vector<unsigned char> image2(u2 * v2 * 4);
for(size_t y = 0; y < height; y++)
for(size_t x = 0; x < width; x++)
for(size_t c = 0; c < 4; c++)
{
image2[4 * u2 * y + 4 * x + c] = image[4 * width * y + 4 * x + c];
}
// Enable the texture for OpenGL.
glEnable(GL_TEXTURE_2D);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); //GL_NEAREST = no smoothing
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, 4, u2, v2, 0, GL_RGBA, GL_UNSIGNED_BYTE, &image2[0]);
return 0;
}

21
texture.h Normal file
View file

@ -0,0 +1,21 @@
//
// texture.h
// interface
//
// Created by Yoz Work on 11/5/12.
//
//
#ifndef __interface__texture__
#define __interface__texture__
#include <iostream>
#ifdef __APPLE__
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#endif
int load_png_as_texture(char* filename, unsigned int width, unsigned int height);
#endif /* defined(__interface__texture__) */