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

Fixing merge conflicts

Browse source
This commit is contained in:
Philip Rosedale 2012-11-07 10:48:24 -08:00
commit 73c4e55da4
16 changed files with 8105 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.DS_Store vendored
View file

Binary file not shown.

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
.DS_Store

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/grayson-particle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 37 KiB

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

BIN
images/sphere.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

60
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,27 @@
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 */; };
F68135971649CF41003040E3 /* sphere.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = F68135951649CF38003040E3 /* sphere.png */; };
F68135B21649EF3F003040E3 /* grayson-particle.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = F68135B01649EF37003040E3 /* grayson-particle.png */; };
/* 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 */,
F68135B21649EF3F003040E3 /* grayson-particle.png in CopyFiles */,
F68135971649CF41003040E3 /* sphere.png in CopyFiles */,
F681356E16488470003040E3 /* philip-image.png in CopyFiles */,
F68135691648830D003040E3 /* pngtest8rgba.png in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
@ -67,6 +75,14 @@
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>"; };
F68135951649CF38003040E3 /* sphere.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sphere.png; sourceTree = "<group>"; };
F68135B01649EF37003040E3 /* grayson-particle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "grayson-particle.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -90,6 +106,7 @@
08FB7794FE84155DC02AAC07 /* test_c_plus */ = {
isa = PBXGroup;
children = (
F6813566164879B5003040E3 /* Resources */,
B6BDADDE15F444DB002A07DF /* CoreServices.framework */,
B6BDADDC15F444D3002A07DF /* AudioUnit.framework */,
B6BDADDA15F444C9002A07DF /* AudioToolbox.framework */,
@ -125,6 +142,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 +166,25 @@
name = Documentation;
sourceTree = "<group>";
};
F6813566164879B5003040E3 /* Resources */ = {
isa = PBXGroup;
children = (
F681356716487A7F003040E3 /* images */,
);
name = Resources;
sourceTree = "<group>";
};
F681356716487A7F003040E3 /* images */ = {
isa = PBXGroup;
children = (
F68135B01649EF37003040E3 /* grayson-particle.png */,
F68135951649CF38003040E3 /* sphere.png */,
F681356D1648846A003040E3 /* philip-image.png */,
F681356816487A7F003040E3 /* pngtest8rgba.png */,
);
path = images;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -207,6 +247,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 +264,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 +287,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",

BIN
interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate generated
View file

Binary file not shown.

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

147
main.cpp
View file

@ -16,6 +16,8 @@
#ifdef __APPLE__
#include <GLUT/glut.h>
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
#else
#include <GL/glut.h>
#endif
@ -45,6 +47,8 @@
#include "hand.h"
#include "particle.h"
#include "texture.h"
//TGAImg Img;
using namespace std;
@ -114,7 +118,7 @@ ParticleSystem balls(10,
#define NUM_TRIS 50000 // 20000 //000
struct {
float vertices[NUM_TRIS * 9];
float vertices[NUM_TRIS * 3];
float normals [NUM_TRIS * 3];
float colors [NUM_TRIS * 3];
float vel [NUM_TRIS * 3];
@ -190,8 +194,21 @@ timeval timer_start, timer_end;
timeval last_frame;
double elapsedTime;
// Particles
// Every second, check the frame rates and other stuff
// To add a new texture:
// 1. Add to the XCode project in the Resources/images group
// (ensure "Copy file" is checked
// 2. Add to the "Copy files" build phase in the project
char texture_filename[] = "grayson-particle.png";
unsigned int texture_width = 256;
unsigned int texture_height = 256;
float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles
// Every second, check the frame rates and other stuff
void Timer(int extra)
{
gettimeofday(&timer_end, NULL);
@ -284,14 +301,12 @@ void init(void)
randFloat() * WORLD_SIZE,
randFloat() * WORLD_SIZE);
glm::vec3 verts[3];
for (j = 0; j < 3; j++) {
verts[j].x = pos.x + randFloat() * tri_scale - tri_scale/2.f;
verts[j].y = pos.y + randFloat() * tri_scale - tri_scale/2.f;
verts[j].z = pos.z + randFloat() * tri_scale - tri_scale/2.f;
tris.vertices[i*9 + j*3] = verts[j].x;
tris.vertices[i*9 + j*3 + 1] = verts[j].y;
tris.vertices[i*9 + j*3 + 2] = verts[j].z;
}
verts[j].x = pos.x + randFloat() * tri_scale - tri_scale/2.f;
verts[j].y = pos.y + randFloat() * tri_scale - tri_scale/2.f;
verts[j].z = pos.z + randFloat() * tri_scale - tri_scale/2.f;
tris.vertices[i*3] = verts[j].x;
tris.vertices[i*3 + 1] = verts[j].y;
tris.vertices[i*3 + 2] = verts[j].z;
// reuse pos for the normal
glm::normalize((pos += glm::cross(verts[1] - verts[0], verts[2] - verts[0])));
tris.normals[i*3] = pos.x;
@ -371,18 +386,9 @@ void update_tris()
if (tris.element[i] == 1) // If moving object, move and drag
{
// Update position
tris.vertices[i*9+0] += tris.vel[i*3];
tris.vertices[i*9+3] += tris.vel[i*3];
tris.vertices[i*9+6] += tris.vel[i*3];
tris.vertices[i*9+1] += tris.vel[i*3+1];
tris.vertices[i*9+4] += tris.vel[i*3+1];
tris.vertices[i*9+7] += tris.vel[i*3+1];
tris.vertices[i*9+2] += tris.vel[i*3+2];
tris.vertices[i*9+5] += tris.vel[i*3+2];
tris.vertices[i*9+8] += tris.vel[i*3+2];
tris.vertices[i*3+0] += tris.vel[i*3];
tris.vertices[i*3+1] += tris.vel[i*3+1];
tris.vertices[i*3+2] += tris.vel[i*3+2];
// Add a little gravity
//tris.vel[i*3+1] -= 0.0001;
@ -397,7 +403,7 @@ void update_tris()
if (tris.element[i] == 1)
{
// Read and add velocity from field
field_value(field_val, &tris.vertices[i*9]);
field_value(field_val, &tris.vertices[i*3]);
tris.vel[i*3] += field_val[0];
tris.vel[i*3+1] += field_val[1];
tris.vel[i*3+2] += field_val[2];
@ -405,15 +411,15 @@ void update_tris()
// bounce at edge of world
// X-Direction
if ((tris.vertices[i*9+0] > WORLD_SIZE) || (tris.vertices[i*9+0] < 0.0))
if ((tris.vertices[i*3+0] > WORLD_SIZE) || (tris.vertices[i*3+0] < 0.0))
tris.vel[i*3]*= -1.0;
// Y-direction
if ((tris.vertices[i*9+1] > WORLD_SIZE) || (tris.vertices[i*9+1] < 0.0))
if ((tris.vertices[i*3+1] > WORLD_SIZE) || (tris.vertices[i*3+1] < 0.0))
{
tris.vel[i*3+1]*= -1.0;
}
// Z-Direction
if ((tris.vertices[i*9+2] > WORLD_SIZE) || (tris.vertices[i*9+2] < 0.0))
if ((tris.vertices[i*3+2] > WORLD_SIZE) || (tris.vertices[i*3+2] < 0.0))
tris.vel[i*3+2]*= -1.0;
}
}
@ -560,7 +566,7 @@ void update_pos(float frametime)
void display(void)
{
int i,j;
int i;
glEnable (GL_DEPTH_TEST);
glEnable(GL_LIGHTING);
@ -589,35 +595,76 @@ 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();
// Draw Triangles
glBegin(GL_TRIANGLES);
for (i = 0; i < NUM_TRIS; i++)
// 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 */
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 Point Sprites
/* assuming you have setup a 32-bit RGBA texture with a legal name */
glActiveTexture(GL_TEXTURE0);
glEnable( GL_TEXTURE_2D );
glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic );
float maxSize = 0.0f;
glGetFloatv( GL_POINT_SIZE_MAX_ARB, &maxSize );
glPointSize( maxSize );
glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize );
// glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f );
glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE );
glEnable( GL_POINT_SPRITE_ARB );
glBegin( GL_POINTS );
{
glColor3f(tris.colors[i*3],
tris.colors[i*3+1],
tris.colors[i*3+2]);
for (j = 0; j < 3; j++)
for (i = 0; i < NUM_TRIS; i++)
{
glVertex3f(tris.vertices[i*9 + j*3],
tris.vertices[i*9 + j*3 + 1],
tris.vertices[i*9 + j*3 + 2]);
// glColor3f(tris.colors[i*3],
// tris.colors[i*3+1],
// tris.colors[i*3+2]);
// for (j = 0; j < 3; j++)
// {
// glVertex3f(tris.vertices[i*9 + j*3],
// tris.vertices[i*9 + j*3 + 1],
// tris.vertices[i*9 + j*3 + 2]);
// }
// glNormal3f(tris.normals[i*3],
// tris.normals[i*3 + 1],
// tris.normals[i*3 + 2]);
glVertex3f(tris.vertices[i*3],
tris.vertices[i*3+1],
tris.vertices[i*3+2]);
}
glNormal3f(tris.normals[i*3],
tris.normals[i*3 + 1],
tris.normals[i*3 + 2]);
}
glEnd();
glDisable( GL_TEXTURE_2D );
glDisable( GL_POINT_SPRITE_ARB );
// Show field vectors
if (display_field) field_render();
@ -630,7 +677,7 @@ void display(void)
}
myHand.render();
balls.render();
// balls.render();
// Render the world box
render_world_box();
@ -792,7 +839,7 @@ void idle(void)
field_simulate(1.f/FPS);
myHead.simulate(1.f/FPS);
myHand.simulate(1.f/FPS);
balls.simulate(1.f/FPS);
// balls.simulate(1.f/FPS);
if (!step_on) glutPostRedisplay();
last_frame = check;

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__) */