tiled backgrounds, ortho fix

8 files changed, 35 insertions, 26 deletions

diff --git a/Changelog b/Changelog
index 1a75022..0fe9386 100644
--- a/Changelog
+++ b/Changelog
@@ -304,3 +304,10 @@
 	- added entity deletion when an entity dies
 	- fixed errors with typewriter-text
 	- finished cutscene triggers
+
+11/18/2015:
+===========
+
+	- converted layered background items to tiles
+	- fixed ortho in small spaces
+	- began formalizing item system
diff --git a/assets/bgFarTreeTile.png b/assets/bgFarTreeTile.png
new file mode 100644
index 0000000..07546a5
--- /dev/null
+++ b/assets/bgFarTreeTile.png
diff --git a/assets/bgFrontTreeTile.png b/assets/bgFrontTreeTile.png
new file mode 100644
index 0000000..7fc7450
--- /dev/null
+++ b/assets/bgFrontTreeTile.png
diff --git a/assets/bgMidTreeTile.png b/assets/bgMidTreeTile.png
new file mode 100644
index 0000000..126723e
--- /dev/null
+++ b/assets/bgMidTreeTile.png
diff --git a/assets/bgTrashWaves.png b/assets/bgTrashWaves.png
new file mode 100644
index 0000000..6a177cd
--- /dev/null
+++ b/assets/bgTrashWaves.png
diff --git a/main.cpp b/main.cpp
index 62cd87a..1f8c58e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -434,12 +434,12 @@ int main(int argc, char *argv[]){
 	 *	Load a temporary background image.
 	*/
 	
-	bgDay		 =Texture::loadTexture("assets/bg.png"			 );
-	bgNight		 =Texture::loadTexture("assets/bgn.png"			 );
-	bgMtn		 =Texture::loadTexture("assets/bgFarMountain.png");
-	bgTreesFront =Texture::loadTexture("assets/bgFrontTree.png"	 );
-	bgTreesMid	 =Texture::loadTexture("assets/bgMidTree.png"	 );
-	bgTreesFar	 =Texture::loadTexture("assets/bgFarTree.png"	 );
+	bgDay		 =Texture::loadTexture("assets/bg.png"				);
+	bgNight		 =Texture::loadTexture("assets/bgn.png"				);
+	bgMtn		 =Texture::loadTexture("assets/bgFarMountain.png"	);
+	bgTreesFront =Texture::loadTexture("assets/bgFrontTreeTile.png"	);
+	bgTreesMid	 =Texture::loadTexture("assets/bgMidTreeTile.png"	);
+	bgTreesFar	 =Texture::loadTexture("assets/bgFarTreeTile.png"	);
 	
 	/*
 	 *	Load sprites used in the inventory menu. See src/inventory.cpp
@@ -572,7 +572,9 @@ void render(){
 	 *  see past the world render
 	*/
 	
-	if(!worldInside){
+	if(currentWorld->getTheWidth() < SCREEN_WIDTH){
+		offset.x = 0;
+	}else if(!worldInside){
 		if(player->loc.x - SCREEN_WIDTH/2 < currentWorld->getTheWidth() * -0.5f)
 			offset.x = ((currentWorld->getTheWidth() * -0.5f) + SCREEN_WIDTH / 2) + player->width / 2;
 		if(player->loc.x + player->width + SCREEN_WIDTH/2 > currentWorld->getTheWidth() *  0.5f)
@@ -674,7 +676,7 @@ void render(){
 	 *	Draws stars if it is an appropriate time of day for them.
 	*/
 
-	int base = 40 - (int)worldGetYBase(currentWorld);
+	int base = 80;
 	int shade = worldShade*2;
 
 	if(((weather==DARK )&(tickCount%DAY_CYCLE)<DAY_CYCLE/2)   ||
@@ -719,33 +721,33 @@ void render(){
 	glBindTexture(GL_TEXTURE_2D, bgTreesFar);
 	glBegin(GL_QUADS);
 	safeSetColorA(100-shade,100-shade,100-shade,240);
-	for(int i = 0; i <= currentWorld->getTheWidth()/1920; i++){
-		glTexCoord2i(0,1);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * i)+offset.x*.6,base);
-		glTexCoord2i(1,1);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * (i+1))+offset.x*.6,base);
-		glTexCoord2i(1,0);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * (i+1))+offset.x*.6,base+1080);
-		glTexCoord2i(0,0);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * i)+offset.x*.6,base+1080);
+	for(int i = -currentWorld->getTheWidth() / 2; i <= currentWorld->getTheWidth() / 2; i += 300){
+		glTexCoord2i(0,1);glVertex2i(i+offset.x*.6,base);
+		glTexCoord2i(1,1);glVertex2i((i+300)+offset.x*.6,base);
+		glTexCoord2i(1,0);glVertex2i((i+300)+offset.x*.6,base+200);
+		glTexCoord2i(0,0);glVertex2i(i+offset.x*.6,base+200);
 	}
 	glEnd();
 
 	glBindTexture(GL_TEXTURE_2D, bgTreesMid);
 	glBegin(GL_QUADS);
 	safeSetColorA(150-shade,150-shade,150-shade,250);
-	for(int i = 0; i <= currentWorld->getTheWidth()/1920; i++){
-		glTexCoord2i(0,1);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * i)+offset.x*.4,base);
-		glTexCoord2i(1,1);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * (i+1))+offset.x*.4,base);
-		glTexCoord2i(1,0);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * (i+1))+offset.x*.4,base+1080);
-		glTexCoord2i(0,0);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * i)+offset.x*.4,base+1080);
+	for(int i = -currentWorld->getTheWidth() / 2; i <= currentWorld->getTheWidth() / 2; i += 400){
+		glTexCoord2i(0,1);glVertex2i(i+offset.x*.4,base);
+		glTexCoord2i(1,1);glVertex2i((i+300)+offset.x*.4,base);
+		glTexCoord2i(1,0);glVertex2i((i+300)+offset.x*.4,base+200);
+		glTexCoord2i(0,0);glVertex2i(i+offset.x*.4,base+200);
 	}
 	glEnd();
 
 	glBindTexture(GL_TEXTURE_2D, bgTreesFront);
 	glBegin(GL_QUADS);
 	safeSetColorA(255-shade,255-shade,255-shade,255);
-	for(int i = 0; i <= currentWorld->getTheWidth()/1920; i++){
-		glTexCoord2i(0,1);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * i)+offset.x*.25,base);
-		glTexCoord2i(1,1);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * (i+1))+offset.x*.25,base);
-		glTexCoord2i(1,0);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * (i+1))+offset.x*.25,base+1080);
-		glTexCoord2i(0,0);glVertex2i((currentWorld->getTheWidth()*-0.5f)+(1920 * i)+offset.x*.25,base+1080);
+	for(int i = -currentWorld->getTheWidth() / 2; i <= currentWorld->getTheWidth() / 2; i += 280){
+		glTexCoord2i(0,1);glVertex2i(i+offset.x*.25,base);
+		glTexCoord2i(1,1);glVertex2i((i+300)+offset.x*.25,base);
+		glTexCoord2i(1,0);glVertex2i((i+300)+offset.x*.25,base+200);
+		glTexCoord2i(0,0);glVertex2i(i+offset.x*.25,base+200);
 	}
 	glEnd();
 	glDisable(GL_TEXTURE_2D);
diff --git a/src/world.cpp b/src/world.cpp
index 335bda6..904bed7 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -17,13 +17,13 @@
 bool worldInside = false;
 
 float worldGetYBase(World *w){
-	float base = 0;
+	/*float base = 0;
 	World *ptr = w;
 	while(ptr->infront){
 		base+=DRAW_Y_OFFSET;
 		ptr=ptr->infront;
-	}
-	return base;
+	}*/
+	return /*base*/ GEN_MIN;
 }
 
 struct wSavePack {
diff --git a/xcf/bgTrashWaves.xcf b/xcf/bgTrashWaves.xcf
new file mode 100644
index 0000000..0214d8d
--- /dev/null
+++ b/xcf/bgTrashWaves.xcf