Moved license and readme back to the root directory
This commit is contained in:
parent
668bc35226
commit
e948cb4db7
|
@ -41,7 +41,7 @@ make -j4 test
|
||||||
- [x] Basic input handling (currently at cave man stage)
|
- [x] Basic input handling (currently at cave man stage)
|
||||||
- [x] Entity system (Partially functional currently)
|
- [x] Entity system (Partially functional currently)
|
||||||
- [ ] Basic UI functionality
|
- [ ] Basic UI functionality
|
||||||
- [x] Buttons
|
- [ ] Buttons
|
||||||
- [x] Text
|
- [x] Text
|
||||||
- [ ] Dropdown menu
|
- [ ] Dropdown menu
|
||||||
- [ ] Slider
|
- [ ] Slider
|
|
@ -230,22 +230,29 @@ int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
switch (event.key.keysym.scancode)
|
switch (event.key.keysym.scancode)
|
||||||
{
|
{
|
||||||
|
/* Arrow keys */
|
||||||
/* Up arrow */
|
/* Up arrow */
|
||||||
case (82):
|
case (82):
|
||||||
playerMovementDirection = Side::Up;
|
playerMovementDirection = Side::Up;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (14):
|
/* Down arrow */
|
||||||
playerMovementDirection = Side::Up;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case (81):
|
case (81):
|
||||||
playerMovementDirection = Side::Down;
|
playerMovementDirection = Side::Down;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* Vim keys */
|
||||||
|
/* k */
|
||||||
|
case (14):
|
||||||
|
playerMovementDirection = Side::Up;
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* j */
|
||||||
case (13):
|
case (13):
|
||||||
playerMovementDirection = Side::Down;
|
playerMovementDirection = Side::Down;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* Controller */
|
||||||
|
|
||||||
default:
|
default:
|
||||||
playerMovementDirection = Side::None;
|
playerMovementDirection = Side::None;
|
||||||
|
|
|
@ -32,7 +32,7 @@ namespace Birb2D
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Debug::Log("Initializing SDL...");
|
Debug::Log("Initializing SDL...");
|
||||||
if (SDL_Init(SDL_INIT_VIDEO) > 0)
|
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) > 0)
|
||||||
{
|
{
|
||||||
Debug::Log("SDL Init failed: " + (std::string)SDL_GetError(), Debug::error);
|
Debug::Log("SDL Init failed: " + (std::string)SDL_GetError(), Debug::error);
|
||||||
exit(2);
|
exit(2);
|
||||||
|
@ -220,7 +220,6 @@ namespace Birb2D
|
||||||
|
|
||||||
void Render::DrawCircle(SDL_Color color, Vector2int pos, int radius)
|
void Render::DrawCircle(SDL_Color color, Vector2int pos, int radius)
|
||||||
{
|
{
|
||||||
//SDL_SetRenderDrawColor(Global::RenderVars::Renderer, color.r, color.g, color.b, color.a);
|
|
||||||
Uint32 uColor = (255<<24) + (int(color.b)<<16) + (int(color.g)<<8) + int(color.r);;
|
Uint32 uColor = (255<<24) + (int(color.b)<<16) + (int(color.g)<<8) + int(color.r);;
|
||||||
filledCircleColor(Global::RenderVars::Renderer, pos.x, pos.y, radius, uColor);
|
filledCircleColor(Global::RenderVars::Renderer, pos.x, pos.y, radius, uColor);
|
||||||
ResetDrawColor();
|
ResetDrawColor();
|
||||||
|
|
Loading…
Reference in New Issue