Formaaaaaat

platform/nspire/Graphics.cpp

@@ -32,10 +32,10 @@ void GRAPHICS::put_sprite(const Texture &sheet, int x, int y,
 }
 
 void GRAPHICS::put_sprite_tint(const Texture &sheet, int x, int y,
-                     const WalrusRPG::Utils::Rect &window,
-                     const WalrusRPG::Graphics::Pixel &color)
+                               const WalrusRPG::Utils::Rect &window,
+                               const WalrusRPG::Graphics::Pixel &color)
 {
-	CXfb::draw_sprite_sheet_tint(sheet.data, x, y, window, color.value);
+    CXfb::draw_sprite_sheet_tint(sheet.data, x, y, window, color.value);
 }
 
 void GRAPHICS::fill(const WalrusRPG::Graphics::Pixel &color)

platform/nspire/Input.cpp

@@ -14,41 +14,39 @@ struct InputMap
 
 static KeyState key_states[Key::K_SIZE] = {KeyState::KS_RELEASED};
 static InputMap key_map[] = {
-    {Key::K_A, KEY_NSPIRE_CTRL},
-    {Key::K_B, KEY_NSPIRE_SHIFT},
-    {Key::K_L, KEY_NSPIRE_TAB},
-    {Key::K_R, KEY_NSPIRE_MENU},
+    {Key::K_A, KEY_NSPIRE_CTRL},     {Key::K_B, KEY_NSPIRE_SHIFT},
+    {Key::K_L, KEY_NSPIRE_TAB},      {Key::K_R, KEY_NSPIRE_MENU},
 
-    {Key::K_UP, KEY_NSPIRE_8},
-    {Key::K_DOWN, KEY_NSPIRE_5},
-    {Key::K_LEFT, KEY_NSPIRE_4},
-    {Key::K_RIGHT, KEY_NSPIRE_6},
+    {Key::K_UP, KEY_NSPIRE_8},       {Key::K_DOWN, KEY_NSPIRE_5},
+    {Key::K_LEFT, KEY_NSPIRE_4},     {Key::K_RIGHT, KEY_NSPIRE_6},
 
-    {Key::K_START, KEY_NSPIRE_HOME},
-    {Key::K_SELECT, KEY_NSPIRE_ESC},
+    {Key::K_START, KEY_NSPIRE_HOME}, {Key::K_SELECT, KEY_NSPIRE_ESC},
 };
 
 void INPUT::key_poll()
 {
-    for(unsigned i = 0; i < K_SIZE; i++)
+    for (unsigned i = 0; i < K_SIZE; i++)
     {
         bool current_key_state = isKeyPressed(key_map[i].key_code);
         KeyState previous_key_state = key_states[i];
 
         KeyState resulting_key_state = KS_RELEASED;
-        if(current_key_state)
+        if (current_key_state)
         {
-            if(previous_key_state == KS_RELEASED || previous_key_state == KS_JUST_RELEASED)
-                    resulting_key_state = KS_JUST_PRESSED;
-            else if(previous_key_state == KS_JUST_PRESSED || previous_key_state == KS_PRESSED)
-                    resulting_key_state = KS_PRESSED;
+            if (previous_key_state == KS_RELEASED ||
+                previous_key_state == KS_JUST_RELEASED)
+                resulting_key_state = KS_JUST_PRESSED;
+            else if (previous_key_state == KS_JUST_PRESSED ||
+                     previous_key_state == KS_PRESSED)
+                resulting_key_state = KS_PRESSED;
         }
         else
         {
-            if(previous_key_state == KS_PRESSED || previous_key_state == KS_JUST_PRESSED)
-                    resulting_key_state = KS_JUST_RELEASED;
-            else if(previous_key_state == KS_JUST_RELEASED || previous_key_state == KS_RELEASED)
-                    resulting_key_state = KS_RELEASED;
+            if (previous_key_state == KS_PRESSED || previous_key_state == KS_JUST_PRESSED)
+                resulting_key_state = KS_JUST_RELEASED;
+            else if (previous_key_state == KS_JUST_RELEASED ||
+                     previous_key_state == KS_RELEASED)
+                resulting_key_state = KS_RELEASED;
         }
         key_states[i] = resulting_key_state;
     }
@@ -61,7 +59,6 @@ bool INPUT::key_pressed(Key key)
 bool INPUT::key_released(Key key)
 {
     return key_states[key] == KS_JUST_RELEASED;
-
 }
 bool INPUT::key_down(Key key)
 {
@@ -70,5 +67,4 @@ bool INPUT::key_down(Key key)
 bool INPUT::key_up(Key key)
 {
     return key_states[key] == KS_JUST_RELEASED || key_states[key] == KS_RELEASED;
-
 }

platform/nspire/Interrupts.cpp

@@ -30,7 +30,8 @@ void INTERRUPTS::init()
     *interrupt_pointer = (uint32_t) &isr;
 
     // Enable IRQ in the CPU
-    asm("mrs r1, cpsr \n\t"
+    asm(
+        "mrs r1, cpsr \n\t"
         "bic r1, r1, #0x80 \n\t"
         "msr cpsr, r1"
         :
@@ -41,7 +42,8 @@ void INTERRUPTS::init()
 void INTERRUPTS::off()
 {
     // Disable IRQ in the CPU
-    asm("mrs r1, cpsr \n\t"
+    asm(
+        "mrs r1, cpsr \n\t"
         "orr r1, r1, #0x80 \n\t"
         "msr cpsr, r1"
         :

platform/sfml/Graphics.cpp

@@ -11,7 +11,8 @@ sf::RenderTexture buffer;
 
 void GRAPHICS::init()
 {
-    window.create(sf::VideoMode::getDesktopMode(), "WalrusRPG", sf::Style::Fullscreen);
+    // window.create(sf::VideoMode::getDesktopMode(), "WalrusRPG", sf::Style::Fullscreen);
+    window.create(sf::VideoMode(640, 480), "WalrusRPG");
     window.setFramerateLimit(60);
     view = sf::View(window.getDefaultView());
     buffer.create(320, 240);
@@ -59,20 +60,20 @@ void GRAPHICS::put_sprite(const Texture &sheet, int x, int y,
 }
 
 void GRAPHICS::put_sprite_tint(const Texture &sheet, int x, int y,
-                     const WalrusRPG::Utils::Rect &window,
-                     const WalrusRPG::Graphics::Pixel &color)
+                               const WalrusRPG::Utils::Rect &window,
+                               const WalrusRPG::Graphics::Pixel &color)
 {
     sf::Sprite sprite;
     sprite.setTexture(sheet.data);
     sprite.setTextureRect(sf::IntRect(window.x, window.y, window.width, window.height));
     sprite.setPosition(x, y);
-    sprite.setColor(sf::Color(color.r<<3, color.g<<2, color.b<<3, 255));
+    sprite.setColor(sf::Color(color.r << 3, color.g << 2, color.b << 3, 255));
     buffer.draw(sprite);
 }
 
 void GRAPHICS::fill(const WalrusRPG::Graphics::Pixel &color)
 {
-    buffer.clear(sf::Color(color.r<<3, color.g<<2, color.b<<2, 255));
+    buffer.clear(sf::Color(color.r << 3, color.g << 2, color.b << 2, 255));
 }
 
 void GRAPHICS::put_pixel(uint16_t x, uint16_t y, const WalrusRPG::Graphics::Pixel &color)

platform/sfml/Input.cpp

@@ -35,25 +35,28 @@ InputMap key_map[] = {
 void INPUT::key_poll()
 {
     bool hasFocus = window.hasFocus();
-    for(unsigned i = 0; i < K_SIZE; i++)
+    for (unsigned i = 0; i < K_SIZE; i++)
     {
         bool current_key_state = hasFocus && Keyboard::isKeyPressed(key_map[i].key_code);
         KeyState previous_key_state = key_states[i];
 
         KeyState resulting_key_state = KS_RELEASED;
-        if(current_key_state)
+        if (current_key_state)
         {
-            if(previous_key_state == KS_RELEASED || previous_key_state == KS_JUST_RELEASED)
-                    resulting_key_state = KS_JUST_PRESSED;
-            else if(previous_key_state == KS_JUST_PRESSED || previous_key_state == KS_PRESSED)
-                    resulting_key_state = KS_PRESSED;
+            if (previous_key_state == KS_RELEASED ||
+                previous_key_state == KS_JUST_RELEASED)
+                resulting_key_state = KS_JUST_PRESSED;
+            else if (previous_key_state == KS_JUST_PRESSED ||
+                     previous_key_state == KS_PRESSED)
+                resulting_key_state = KS_PRESSED;
         }
         else
         {
-            if(previous_key_state == KS_PRESSED || previous_key_state == KS_JUST_PRESSED)
-                    resulting_key_state = KS_JUST_RELEASED;
-            else if(previous_key_state == KS_JUST_RELEASED || previous_key_state == KS_RELEASED)
-                    resulting_key_state = KS_RELEASED;
+            if (previous_key_state == KS_PRESSED || previous_key_state == KS_JUST_PRESSED)
+                resulting_key_state = KS_JUST_RELEASED;
+            else if (previous_key_state == KS_JUST_RELEASED ||
+                     previous_key_state == KS_RELEASED)
+                resulting_key_state = KS_RELEASED;
         }
         key_states[i] = resulting_key_state;
     }
@@ -66,7 +69,6 @@ bool INPUT::key_pressed(Key key)
 bool INPUT::key_released(Key key)
 {
     return key_states[key] == KS_JUST_RELEASED;
-
 }
 bool INPUT::key_down(Key key)
 {

platform/sfml/Texture.cpp

@@ -13,24 +13,24 @@ using WalrusRPG::Graphics::Pixel;
 TEXTURE::Texture(char *data) : data()
 {
     // UNUSED(data);
-    uint16_t* data_16 = (uint16_t*) data;
+    uint16_t *data_16 = (uint16_t *) data;
     // TOOD : load from PIAF
     // this->data.loadFromFile("art/overworld.png");
-    // this->data.loadFromMemory(data+6, data_16[0]*data_16[1], sf::IntRect(0, 0, data_16[0], data_16[1]));
+    // this->data.loadFromMemory(data+6, data_16[0]*data_16[1], sf::IntRect(0, 0,
+    // data_16[0], data_16[1]));
     this->data.create(data_16[0], data_16[1]);
-    sf::Uint8* pixels = new sf::Uint8[data_16[0]*data_16[1]*4];
-    for(unsigned y = 0; y < data_16[1]; y++)
+    sf::Uint8 *pixels = new sf::Uint8[data_16[0] * data_16[1] * 4];
+    for (unsigned y = 0; y < data_16[1]; y++)
     {
-	    for(unsigned x = 0; x < data_16[0]; x++)
-	    {
-	    	Pixel pix(data_16[3 + y*data_16[0] + x]);
-	    	unsigned pixel_offset = data_16[0]*y + x;
-	    	pixels[4*pixel_offset] = pix.r<<3;
-	    	pixels[4*pixel_offset+1] = pix.g<<2;
-	    	pixels[4*pixel_offset+2] = pix.b<<3;
-	    	pixels[4*pixel_offset+3] = pix.value == data_16[2] ? 0 : 255;
-	    }
-
+        for (unsigned x = 0; x < data_16[0]; x++)
+        {
+            Pixel pix(data_16[3 + y * data_16[0] + x]);
+            unsigned pixel_offset = data_16[0] * y + x;
+            pixels[4 * pixel_offset] = pix.r << 3;
+            pixels[4 * pixel_offset + 1] = pix.g << 2;
+            pixels[4 * pixel_offset + 2] = pix.b << 3;
+            pixels[4 * pixel_offset + 3] = pix.value == data_16[2] ? 0 : 255;
+        }
     }
     this->data.update(pixels);
 

src/engine/StateMachine.cpp

@@ -47,7 +47,7 @@ void STATEMACHINE::run()
         update_stamp = Timing::gettime();
         update_time = update_stamp - last_update;
         Input::key_poll();
-        stack.back()->update(100*update_time/TIMER_FREQ);
+        stack.back()->update(100 * update_time / TIMER_FREQ);
         last_update = update_stamp;
 
         if (Timing::gettime() < loop_next)
@@ -55,7 +55,7 @@ void STATEMACHINE::run()
             frame_stamp = Timing::gettime();
             frame_time = frame_stamp - last_frame;
             Graphics::frame_begin();
-            stack.back()->render(100*frame_time/TIMER_FREQ);
+            stack.back()->render(100 * frame_time / TIMER_FREQ);
             last_frame = frame_stamp;
 
             Text::print_format(0, 0, "WalrusRPG test build %s", git_version);