UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-27 17:50:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Fix the emscripten build

Browse Source 
Change-Id: Ia54c5de4191c47d9840854d9aad12f87a9110da3
This commit is contained in:
Romain Goyet
2017-05-15 22:04:37 +02:00
parent 739c362ff0
commit a1552b2fa1
15 changed files with 226 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
ion/src/emscripten/main.cpp
View File

@@ -1,112 +1,13 @@
#include <ion.h>
extern "C" {
#include <assert.h>
#include <stdio.h>
#include <unistd.h>
#include <SDL/SDL.h>
}
extern "C" {
void IonEmscriptenPushEvent(int e);
}
SDL_Surface * screen = nullptr;
Ion::Events::Event sEvent = Ion::Events::None;
void IonEmscriptenPushEvent(int eventNumber) {
sEvent = Ion::Events::Event(eventNumber);
}
#include "display.h"
#include "events.h"
int main(int argc, char * argv[]) {
SDL_EnableUNICODE(1); // We're using Unicode values from Keyboard input
SDL_Init(SDL_INIT_VIDEO);
screen = SDL_SetVideoMode(Ion::Display::Width, Ion::Display::Height, 32, SDL_HWSURFACE);
Ion::Display::Emscripten::init();
Ion::Events::Emscripten::init();
ion_app();
return 0;
}
void Ion::Display::pushRect(KDRect r, const KDColor * pixels) {
if (SDL_MUSTLOCK(screen)) {
SDL_LockSurface(screen);
}
int pixelNumber = 0;
for (int j=r.top(); j<r.bottom(); j++) {
for (int i=r.left(); i<r.right(); i++) {
KDColor c = pixels[pixelNumber++];
*((Uint32*)screen->pixels + j * Ion::Display::Width + i) = SDL_MapRGB(screen->format, c.red(), c.green(), c.blue());
}
}
if (SDL_MUSTLOCK(screen)) {
SDL_UnlockSurface(screen);
}
SDL_UpdateRect(screen, r.x(), r.y(), r.width(), r.height());
}
void Ion::Display::pushRectUniform(KDRect r, KDColor c) {
Uint32 sdlColor = SDL_MapRGB(screen->format, c.red(), c.green(), c.blue());
SDL_Rect sdlRect = { r.x(), r.y(), r.width(), r.height() };
SDL_FillRect(screen, &sdlRect, sdlColor);
SDL_UpdateRect(screen, r.x(), r.y(), r.width(), r.height());
}
void Ion::Display::pullRect(KDRect r, KDColor * pixels) {
}
using namespace Ion::Events;
static constexpr Event sEventForASCIICharAbove32[95] = {
Space, Exclamation, DoubleQuotes, None, None, None, None, None,
LeftParenthesis, RightParenthesis, Multiplication, Plus, Comma, Minus, Dot, Division,
Zero, One, Two, Three, Four, Five, Six, Seven,
Eight, Nine, Colon, SemiColon, Lower, Equal, Greater, Question,
None, UpperA, UpperB, UpperC, UpperD, UpperE, UpperF, UpperG,
UpperH, UpperI, UpperJ, UpperK, UpperL, UpperM, UpperN, UpperO,
UpperP, UpperQ, UpperR, UpperS, UpperT, UpperU, UpperV, UpperW,
UpperX, UpperY, UpperZ, LeftBracket, None, RightBracket, Power, Underscore,
None, LowerA, LowerB, LowerC, LowerD, LowerE, LowerF, LowerG,
LowerH, LowerI, LowerJ, LowerK, LowerL, LowerM, LowerN, LowerO,
LowerP, LowerQ, LowerR, LowerS, LowerT, LowerU, LowerV, LowerW,
LowerX, LowerY, LowerZ, LeftBrace, None, RightBrace, None
};
Ion::Events::Event Ion::Events::getEvent() {
if (sEvent != Ion::Events::None) {
Ion::Events::Event event = sEvent;
sEvent = Ion::Events::None;
return event;
}
SDL_Event event;
if (SDL_PollEvent(&event)) {
if (event.type == SDL_KEYDOWN) {
switch(event.key.keysym.sym) {
case SDLK_UP:
return Ion::Events::Up;
case SDLK_DOWN:
return Ion::Events::Down;
case SDLK_LEFT:
return Ion::Events::Left;
case SDLK_RIGHT:
return Ion::Events::Right;
case SDLK_RETURN:
return Ion::Events::OK;
case SDLK_ESCAPE:
return Ion::Events::Back;
case SDLK_BACKSPACE:
return Ion::Events::Backspace;
}
if (event.key.keysym.unicode >= 32 && event.key.keysym.unicode < 127) {
return sEventForASCIICharAbove32[event.key.keysym.unicode-32];
}
}
}
return Ion::Events::None;
}
bool Ion::Keyboard::keyDown(Ion::Keyboard::Key key) {
//SDL_Quit();
return false;
}
void Ion::msleep(long ms) {
usleep(1000*ms);
}