aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--frig.frag22
-rw-r--r--include/entities.h33
-rw-r--r--include/world.h36
-rw-r--r--main.cpp5
-rw-r--r--src/ui.cpp14
-rw-r--r--src/world.cpp101
6 files changed, 140 insertions, 71 deletions
diff --git a/frig.frag b/frig.frag
index 07b4a8a..f750f2d 100644
--- a/frig.frag
+++ b/frig.frag
@@ -3,29 +3,33 @@ uniform sampler2D sampler;
uniform int numLight;
uniform vec2 lightLocation[64];
+uniform float fireFlicker[64];
uniform vec3 lightColor;
uniform float amb;
-float b = .0005;
-float minLight = .05;
-float radius = sqrt(1.0 / (b * minLight));
-
+float b = .0005f;
+float minLight = .05f;
+float radius = sqrt(1.0f / (b * minLight));
//float radius = b*minlight;
+float rand(vec2 co){
+ return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+
void main(){
- vec4 color = vec4(0.0,0.0,0.0,0.0);
+ vec4 color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
for(int i = 0; i < numLight; i++){
vec2 loc = lightLocation[i];
float dist = length(loc - gl_FragCoord.xy);
//float attenuation=1.0/(1.0+0.01*dist+0.00000000001*dist*dist);
- float attenuation = clamp(1.0 - dist*dist/(radius*radius), 0.0, 1.0); attenuation *= attenuation;
+ float attenuation = clamp(1.0f - dist*dist/(radius*radius), 0.0f, 1.0f); attenuation *= attenuation;
- color += vec4(attenuation, attenuation, attenuation, 1.0) * vec4(lightColor, 1.0);
+ color += vec4(attenuation, attenuation, attenuation, 1.0f) * vec4(lightColor, 1.0f) * fireFlicker[i];
}
vec2 coords = gl_TexCoord[0].st;
vec4 tex = texture2D(sampler, coords);
- color += vec4(amb,amb,amb,1.0+amb);
+ color += vec4(amb,amb,amb,1.0f+amb);
gl_FragColor = tex * vec4(color)*tex.a;
}
@@ -36,4 +40,4 @@ void main(){
.00008 500
.00002 1000
.00005 2000
-*/ \ No newline at end of file
+*/
diff --git a/include/entities.h b/include/entities.h
index 450975f..442219c 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -139,10 +139,10 @@ public:
vec2 loc;
vec2 vel;
-
+
float width;
float height;
-
+
float speed; // A speed factor for X movement
/*
@@ -172,7 +172,7 @@ public:
char *name;
GENDER gender;
-
+
Texturec *tex;
Texturec *ntex;
@@ -180,22 +180,21 @@ public:
void draw(void);
void spawn(float, float);
-
+
int ticksToUse; // Used by wander()
-
+
virtual void wander(int){}
virtual void interact(){}
void follow(Entity *e);
-
+
virtual ~Entity(){}
};
class Player : public Entity{
public:
QuestHandler qh;
- bool light = false;
-
+
Player();
~Player();
void save(void);
@@ -206,10 +205,10 @@ class NPC : public Entity{
public:
std::vector<int (*)(NPC *)>aiFunc;
int dialogIndex;
-
+
NPC();
~NPC();
-
+
void addAIFunc(int (*func)(NPC *),bool preload);
void clearAIFunc(void);
virtual void interact();
@@ -233,10 +232,10 @@ public:
World *inWorld;
std::string inside;
std::string textureLoc;
-
+
Structures();
~Structures();
-
+
unsigned int spawn(BUILD_SUB, float, float);
};
@@ -246,10 +245,10 @@ public:
double init_y;
void (*hey)(Mob *callee);
std::string heyid;
-
+
Mob(int);
~Mob();
-
+
void wander(int);
};
@@ -259,13 +258,13 @@ private:
public:
std::string pickupDialog;
bool questObject = false;
-
+
Object();
Object(std::string in,std::string pd);
~Object();
-
+
void reloadTexture(void);
-
+
void interact(void);
};
#endif // ENTITIES_H
diff --git a/include/world.h b/include/world.h
index 152d654..85b5370 100644
--- a/include/world.h
+++ b/include/world.h
@@ -47,16 +47,6 @@ enum class WorldWeather : unsigned char {
};
/**
- * The light structure, used to store light coordinates and color.
- */
-
-typedef struct {
- vec2 loc; /**< Light location */
- Color color; /**< Light color */
- float radius;
-} Light;
-
-/**
* The line structure.
* This structure is used to store the world's ground, stored in vertical
* lines. Dirt color and grass properties are also kept track of here.
@@ -86,6 +76,32 @@ extern std::string currentXML;
class World;
/**
+ * The light structure, used to store light coordinates and color.
+ */
+
+typedef struct {
+ vec2 loc; /**< Light location */
+ Color color; /**< Light color */
+ float radius; /**< Light radius */
+
+ bool belongsTo;
+ Entity *following;
+
+ bool flame;
+ float fireFlicker;
+ vec2 fireLoc;
+
+ // Light(vec2 l, Color c, float r){
+ // loc = l;
+ // color = c;
+ // radius = r;
+ // belongsTo = false;
+ // following = nullptr;
+ // }
+} Light;
+
+
+/**
* The village class, used to group structures into villages.
*/
diff --git a/main.cpp b/main.cpp
index 0b3984e..f9968b6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -343,7 +343,7 @@ int main(int argc, char *argv[]){
std::cout << "Initializing shaders!" << std::endl;
- const GLchar *shaderSource = readFile("test.frag");
+ const GLchar *shaderSource = readFile("frig.frag");
GLint bufferln = GL_FALSE;
int logLength;
@@ -672,7 +672,7 @@ void render(){
ui::putText(offset.x-SCREEN_WIDTH/2,
(offset.y+SCREEN_HEIGHT/2)-ui::fontSize,
- "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n (y)%+.2f\nTc: %u\nHA: %+.2f\nPl: %d\n Vol: %f",
+ "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n (y)%+.2f\nTc: %u\nHA: %+.2f\nVol: %f",
fps,
player->ground,
SCREEN_WIDTH, // Window dimensions
@@ -682,7 +682,6 @@ void render(){
debugY, // The player's y coordinate
tickCount,
handAngle,
- player->light,
VOLUME_MASTER
);
diff --git a/src/ui.cpp b/src/ui.cpp
index 458e797..f0736a5 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1445,10 +1445,18 @@ EXIT:
heyOhLetsGo = 0;
break;
case SDLK_l:
- player->light^=true;
+ currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
+ currentWorld->light.back().belongsTo = true;
+ currentWorld->light.back().following = player;
+ currentWorld->light.back().flame = true;
break;
case SDLK_f:
currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
+ std::cout << currentWorld->light.back().belongsTo << std::endl;
+ currentWorld->light.back().belongsTo = false;
+ std::cout << currentWorld->light.back().belongsTo << std::endl;
+ currentWorld->light.back().following = nullptr;
+ currentWorld->light.back().flame = true;
break;
case SDLK_g:
//currentWorld->addStructure(LAMP_POST, player->loc.x, player->loc.y, NULL);
@@ -1465,13 +1473,15 @@ EXIT:
case SDLK_b:
currentWorld->addStructure(FIRE_PIT, player->loc.x, player->loc.y, "", "");
currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
+ currentWorld->light.back().belongsTo = false;
+ currentWorld->light.back().following = nullptr;
+ currentWorld->light.back().flame = true;
break;
case SDLK_F12:
// Make the BYTE array, factor of 3 because it's RBG.
static GLubyte* pixels;
pixels = new GLubyte[ 3 * SCREEN_WIDTH * SCREEN_HEIGHT];
glReadPixels(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, GL_RGB, GL_UNSIGNED_BYTE, pixels);
-
//static std::thread scr;
//scr = std::thread(takeScreenshot,pixels);
//scr.detach();
diff --git a/src/world.cpp b/src/world.cpp
index 1a7322f..ca070a8 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -529,7 +529,13 @@ draw( Player *p )
glActiveTexture( GL_TEXTURE0 );
bgTex->bindNext();
- std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size() + p->light));
+ for(auto &l : light){
+ if(l.belongsTo){
+ l.loc.x = l.following->loc.x + SCREEN_WIDTH/2;
+ }
+ }
+
+ std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size()));
auto pointArray = pointArrayBuf.get();
for ( i = 0; i < (int)light.size(); i++ ) {
@@ -544,16 +550,11 @@ draw( Player *p )
glUniform1i( glGetUniformLocation( shaderProgram, "sampler"), 0 );
glUniform1f( glGetUniformLocation( shaderProgram, "amb" ), shadeAmbient );
- if ( p->light ) {
- pointArray[2 * (light.size() + 1) ] = (float)( p->loc.x + SCREEN_WIDTH / 2 );
- pointArray[2 * (light.size() + 1) + 1] = (float)( p->loc.y );
- }
-
- if ( light.size() + (int)p->light == 0)
+ if ( light.size() == 0)
glUniform1i( glGetUniformLocation( shaderProgram, "numLight"), 0);
else {
- glUniform1i ( glGetUniformLocation( shaderProgram, "numLight" ), light.size() + (int)p->light );
- glUniform2fv( glGetUniformLocation( shaderProgram, "lightLocation"), light.size() + (int)p->light, pointArray );
+ glUniform1i ( glGetUniformLocation( shaderProgram, "numLight" ), light.size());
+ glUniform2fv( glGetUniformLocation( shaderProgram, "lightLocation"), light.size(), pointArray );
glUniform3f ( glGetUniformLocation( shaderProgram, "lightColor" ), 1.0f, 1.0f, 1.0f );
}
@@ -1219,36 +1220,70 @@ void IndoorWorld::draw(Player *p){
* Draw the background.
*/
- glEnable(GL_TEXTURE_2D);
+ //glEnable(GL_TEXTURE_2D);
- std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size() + p->light));
- auto pointArray = pointArrayBuf.get();
+ std::cout << "Lights and shit" << std::endl;
+ for(auto &l : light){
+ if(l.belongsTo){
+ std::cout << "Is following" << std::endl;
+ l.loc.x = l.following->loc.x + SCREEN_WIDTH/2;
+ l.loc.y = l.following->loc.y;
+ }
+ if(l.flame){
+ l.fireFlicker = .9+((rand()%2)/10.0f);
+ l.fireLoc.x = l.loc.x + (rand()%2-1)*3;
+ l.fireLoc.y = l.loc.y + (rand()%2-1)*3;
+
+ std::cout << l.fireLoc.x << "," << l.fireLoc.y << std::endl;
+ std::cout << l.loc.x << "," << l.loc.y << std::endl << std::endl;
+ }else{
+ l.fireFlicker = 1.0f;
+ }
+ }
- for ( i = 0; i < light.size(); i++ ) {
- pointArray[2 * i ] = light[i].loc.x - offset.x;
- pointArray[2 * i + 1] = light[i].loc.y;
+ std::cout << "Making light arrays" << std::endl;
+ std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size()));
+ auto pointArray = pointArrayBuf.get();
+ GLfloat flameArray[64];
+
+ std::cout << "Setting array locations" << std::endl;
+ for (i = 0; i < light.size(); i++) {
+ if(light[i].flame){
+ pointArray[2 * i ] = light[i].fireLoc.x - offset.x;
+ pointArray[2 * i + 1] = light[i].fireLoc.y;
+ }else{
+ pointArray[2 * i ] = light[i].loc.x - offset.x;
+ pointArray[2 * i + 1] = light[i].loc.y;
+ }
}
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+ std::cout << "Flame array" << std::endl;
+ for(i = 0; i < light.size(); i++){
+ flameArray[i] = light[i].fireFlicker;
+ }
- glUseProgram( shaderProgram );
- glUniform1i( glGetUniformLocation( shaderProgram, "sampler"), 0 );
- glUniform1f( glGetUniformLocation( shaderProgram, "amb" ), 0.3f );
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
- if ( p->light ) {
- pointArray[2 * (light.size() + 1) ] = (float)( p->loc.x + SCREEN_WIDTH / 2 );
- pointArray[2 * (light.size() + 1) + 1] = (float)( p->loc.y );
- }
+ glUseProgram( shaderProgram );
+ glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0);
+ glUniform1f(glGetUniformLocation(shaderProgram, "amb" ), 0.02f + light.size()/50.0f);
+ glUniform1i(glGetUniformLocation(shaderProgram, "fire" ), 1);
- if ( light.size() + (int)p->light == 0)
- glUniform1i( glGetUniformLocation( shaderProgram, "numLight"), 0);
+ std::cout << "Uniform sending" << std::endl;
+ if ( light.size() == 0)
+ glUniform1i(glGetUniformLocation(shaderProgram, "numLight"), 0);
else {
- glUniform1i ( glGetUniformLocation( shaderProgram, "numLight" ), light.size() + (int)p->light );
- glUniform2fv( glGetUniformLocation( shaderProgram, "lightLocation"), light.size() + (int)p->light, pointArray );
- glUniform3f ( glGetUniformLocation( shaderProgram, "lightColor" ), 1.0f, 1.0f, 1.0f );
+ glUniform1i (glGetUniformLocation(shaderProgram, "numLight" ), light.size());
+ glUniform2fv(glGetUniformLocation(shaderProgram, "lightLocation"), light.size(), pointArray);
+ glUniform3f (glGetUniformLocation(shaderProgram, "lightColor" ), 1.0f, 1.0f, 1.0f);
+ glUniform1fv(glGetUniformLocation(shaderProgram, "fireFlicker"), light.size(), flameArray);
}
+ //delete[] flameArray;
+
+ std::cout << "Done shading" << std::endl;
+
bgTex->bind(0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); //for the s direction
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); //for the t direction
@@ -1262,7 +1297,9 @@ void IndoorWorld::draw(Player *p){
glEnd();
glUseProgram(0);
- glDisable(GL_TEXTURE_2D);
+ //glDisable(GL_TEXTURE_2D);
+
+ std::cout << "Faggot" << std::endl;
/*
* Calculate the starting and ending points to draw the ground from.
@@ -1297,6 +1334,8 @@ void IndoorWorld::draw(Player *p){
glEnd();
glUseProgram(0);
+ std::cout << "Queer" << std::endl;
+
/*
* Draw all entities.
*/
@@ -1308,6 +1347,8 @@ void IndoorWorld::draw(Player *p){
e->draw();
p->draw();
+
+ std::cout << "Cranmore Tubing park" << std::endl;
}
Arena::Arena(World *leave,Player *p,Mob *m){
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 11:06:59 +0000