Initial commit, read more
After a few days of work, I'm committing what i've done so far. Mostly I've cherry picked the best parts of the multiplayer branch's modules, and adapted them for use here. I've written a few new components, and I've learnt a few things along the way. I may continue with this branch for a while, before moving the changes into the main branch. Alternatively, it might turn out that this single player version is more fun. We'll see. I've swapped the config system for a pure lua version instead. This is actually fairly flexible. I've also changed the map system and it's API a great deal. The tile sheet can be loaded from lua, and the save directory isn't hard coded anymore. I think this would be a good testbed for a lot of different systems, including the collision system, however the current system (using vectors) is inadequate. I'll have to dig up the old BBox, possilby. This branch will piggy back on the main repo for a while.
This commit is contained in:
Kayne Ruse
@@ -0,0 +1,249 @@
|
||||
/* Copyright: (c) Kayne Ruse 2013, 2014
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any damages
|
||||
* arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you must not
|
||||
* claim that you wrote the original software. If you use this software
|
||||
* in a product, an acknowledgment in the product documentation would be
|
||||
* appreciated but is not required.
|
||||
*
|
||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
||||
* misrepresented as being the original software.
|
||||
*
|
||||
* 3. This notice may not be removed or altered from any source
|
||||
* distribution.
|
||||
*/
|
||||
#include "in_world.hpp"
|
||||
|
||||
#include "utility.hpp"
|
||||
#include "check_bounds.hpp"
|
||||
|
||||
#include "region_pager_api.hpp"
|
||||
#include "tile_sheet_api.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
//-------------------------
|
||||
//Public access members
|
||||
//-------------------------
|
||||
|
||||
InWorld::InWorld(lua_State* L): lua(L) {
|
||||
//register the pager
|
||||
lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
|
||||
lua_pushlightuserdata(lua, &pager);
|
||||
lua_settable(L, LUA_REGISTRYINDEX);
|
||||
|
||||
//register the tilesheet
|
||||
lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
|
||||
lua_pushlightuserdata(lua, &tileSheet);
|
||||
lua_settable(L, LUA_REGISTRYINDEX);
|
||||
|
||||
//setup the component objecrs
|
||||
pager.SetLuaState(lua);
|
||||
|
||||
//get the config info
|
||||
lua_getglobal(lua, "config");
|
||||
lua_getfield(lua, -1, "dir");
|
||||
lua_getfield(lua, -1, "fonts");
|
||||
std::string fonts = lua_tostring(lua, -1);
|
||||
lua_getfield(lua, -2, "interface");
|
||||
std::string interface = lua_tostring(lua, -1);
|
||||
lua_getfield(lua, -3, "sprites");
|
||||
std::string sprites = lua_tostring(lua, -1);
|
||||
lua_getfield(lua, -4, "scripts");
|
||||
std::string scripts = lua_tostring(lua, -1);
|
||||
lua_pop(lua, 6);
|
||||
|
||||
//run the additional scripts
|
||||
if (luaL_dofile(lua, (scripts + "in_world.lua").c_str())) {
|
||||
throw(std::runtime_error(std::string() + "Failed to run in_world.lua: " + lua_tostring(lua, -1) ));
|
||||
}
|
||||
|
||||
//setup the utility objects
|
||||
buttonImage.LoadSurface(interface + "button_menu.bmp");
|
||||
buttonImage.SetClipH(buttonImage.GetClipH()/3);
|
||||
font.LoadSurface(fonts + "pk_white_8.bmp");
|
||||
|
||||
//pass the utility objects
|
||||
backButton.SetImage(&buttonImage);
|
||||
backButton.SetFont(&font);
|
||||
|
||||
//set the button positions
|
||||
backButton.SetX(50);
|
||||
backButton.SetY(50 + buttonImage.GetClipH() * 0);
|
||||
|
||||
//set the button texts
|
||||
backButton.SetText("Back");
|
||||
|
||||
//entities
|
||||
character.GetSprite()->LoadSurface(sprites + "elliot2.bmp", 4, 4);
|
||||
|
||||
//setup the camera
|
||||
camera.margin.x = GetScreen()->w / 2 - character.GetSprite()->GetImage()->GetClipW() / 2;
|
||||
camera.margin.y = GetScreen()->h / 2 - character.GetSprite()->GetImage()->GetClipH() / 2;
|
||||
|
||||
//debug
|
||||
//
|
||||
}
|
||||
|
||||
InWorld::~InWorld() {
|
||||
//unregister the map components
|
||||
lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
|
||||
lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
|
||||
lua_pushnil(lua);
|
||||
lua_settable(lua, LUA_REGISTRYINDEX);
|
||||
lua_pushnil(lua);
|
||||
lua_settable(lua, LUA_REGISTRYINDEX);
|
||||
}
|
||||
|
||||
//-------------------------
|
||||
//Frame loop
|
||||
//-------------------------
|
||||
|
||||
void InWorld::FrameStart() {
|
||||
//
|
||||
}
|
||||
|
||||
void InWorld::Update(double delta) {
|
||||
//update the entities
|
||||
character.Update(delta);
|
||||
|
||||
//check for collisions
|
||||
for (int i = -6; i < 6; ++i) {
|
||||
for (int j = -6; j < 6; ++j) {
|
||||
Vector2 wallPoint = {
|
||||
snapToBase(32.0, character.GetOrigin().x),
|
||||
snapToBase(32.0, character.GetOrigin().y)
|
||||
};
|
||||
wallPoint.x += i * 32;
|
||||
wallPoint.y += j * 32;
|
||||
|
||||
if (!pager.GetSolid(wallPoint.x / 32.0, wallPoint.y / 32.0)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (checkOverlap(character.GetOrigin(), character.GetBounds(), wallPoint, {32.0, 32.0})) {
|
||||
std::cout << "1";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//update the camera
|
||||
camera.origin.x = character.GetOrigin().x - camera.margin.x;
|
||||
camera.origin.y = character.GetOrigin().y - camera.margin.y;
|
||||
|
||||
//TODO: prune distant regions
|
||||
|
||||
//summon nearby unloaded regions
|
||||
const int left = snapToBase(REGION_WIDTH, camera.origin.x / tileSheet.GetTileW());
|
||||
const int top = snapToBase(REGION_HEIGHT, camera.origin.y / tileSheet.GetTileH());
|
||||
const int right = snapToBase(REGION_WIDTH, (camera.origin.x + GetScreen()->w) / tileSheet.GetTileW());
|
||||
const int bottom = snapToBase(REGION_HEIGHT, (camera.origin.y + GetScreen()->h) / tileSheet.GetTileH());
|
||||
|
||||
for (int i = left - REGION_WIDTH; i <= right + REGION_WIDTH; i += REGION_WIDTH) {
|
||||
for (int j = top - REGION_HEIGHT; j <= bottom + REGION_HEIGHT; j += REGION_HEIGHT) {
|
||||
pager.GetRegion(i, j);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void InWorld::FrameEnd() {
|
||||
//
|
||||
}
|
||||
|
||||
void InWorld::RenderFrame() {
|
||||
// SDL_FillRect(GetScreen(), 0, 0);
|
||||
Render(GetScreen());
|
||||
SDL_Flip(GetScreen());
|
||||
fps.Calculate();
|
||||
}
|
||||
|
||||
void InWorld::Render(SDL_Surface* const screen) {
|
||||
//draw all regions
|
||||
for (std::list<Region>::iterator it = pager.GetContainer()->begin(); it != pager.GetContainer()->end(); it++) {
|
||||
tileSheet.DrawRegionTo(screen, &(*it), camera.origin.x, camera.origin.y);
|
||||
}
|
||||
|
||||
//draw the characters
|
||||
character.DrawTo(screen, camera.origin.x, camera.origin.y);
|
||||
|
||||
//draw the UI
|
||||
backButton.DrawTo(screen);
|
||||
font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
|
||||
}
|
||||
|
||||
//-------------------------
|
||||
//Event handlers
|
||||
//-------------------------
|
||||
|
||||
void InWorld::QuitEvent() {
|
||||
//exit the game
|
||||
SetNextScene(SceneList::QUIT);
|
||||
}
|
||||
|
||||
void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
|
||||
backButton.MouseMotion(motion);
|
||||
}
|
||||
|
||||
void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
|
||||
backButton.MouseButtonDown(button);
|
||||
}
|
||||
|
||||
void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
|
||||
if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
|
||||
SetNextScene(SceneList::MAINMENU);
|
||||
}
|
||||
}
|
||||
|
||||
void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
|
||||
//player movement
|
||||
Vector2 motion = character.GetMotion();
|
||||
switch(key.keysym.sym) {
|
||||
case SDLK_LEFT:
|
||||
motion.x -= CHARACTER_WALKING_SPEED;
|
||||
break;
|
||||
case SDLK_RIGHT:
|
||||
motion.x += CHARACTER_WALKING_SPEED;
|
||||
break;
|
||||
case SDLK_UP:
|
||||
motion.y -= CHARACTER_WALKING_SPEED;
|
||||
break;
|
||||
case SDLK_DOWN:
|
||||
motion.y += CHARACTER_WALKING_SPEED;
|
||||
break;
|
||||
}
|
||||
if (character.GetMotion() != motion) {
|
||||
character.SetMotion(motion);
|
||||
character.CorrectSprite();
|
||||
}
|
||||
}
|
||||
|
||||
void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
|
||||
//player movement
|
||||
Vector2 motion = character.GetMotion();
|
||||
switch(key.keysym.sym) {
|
||||
//NOTE: The use of min/max here are to prevent awkward movements
|
||||
case SDLK_LEFT:
|
||||
motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
|
||||
break;
|
||||
case SDLK_RIGHT:
|
||||
motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
|
||||
break;
|
||||
case SDLK_UP:
|
||||
motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
|
||||
break;
|
||||
case SDLK_DOWN:
|
||||
motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
|
||||
break;
|
||||
}
|
||||
if (character.GetMotion() != motion) {
|
||||
character.SetMotion(motion);
|
||||
character.CorrectSprite();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user