kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight refactor

Browse Source
This commit is contained in:
Joshua Granick
2014-06-09 23:44:48 -07:00
parent 78bcad8f95
commit 8fd0f13bc1
15 changed files with 32 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lime/app/Application.hx
View File

@@ -1,19 +1,24 @@
package lime.app; package lime.app;
import lime.graphics.IRenderEventListener;
import lime.graphics.Renderer;
import lime.graphics.RenderEvent;
import lime.graphics.RenderEventManager;
import lime.system.System;
import lime.ui.IKeyEventListener; import lime.ui.IKeyEventListener;
import lime.ui.IMouseEventListener; import lime.ui.IMouseEventListener;
import lime.ui.ITouchEventListener; import lime.ui.ITouchEventListener;
import lime.ui.IWindowEventListener; import lime.ui.IWindowEventListener;
import lime.ui.KeyEventManager;
import lime.ui.KeyEvent; import lime.ui.KeyEvent;
import lime.ui.MouseEventManager; import lime.ui.KeyEventManager;
import lime.ui.MouseEvent; import lime.ui.MouseEvent;
import lime.ui.TouchEventManager; import lime.ui.MouseEventManager;
import lime.ui.TouchEvent; import lime.ui.TouchEvent;
import lime.ui.WindowEventManager; import lime.ui.TouchEventManager;
import lime.ui.Window;
import lime.ui.WindowEvent; import lime.ui.WindowEvent;
import lime.system.System; import lime.ui.WindowEventManager;
class Application implements IKeyEventListener implements IMouseEventListener implements IRenderEventListener implements ITouchEventListener implements IUpdateEventListener implements IWindowEventListener { class Application implements IKeyEventListener implements IMouseEventListener implements IRenderEventListener implements ITouchEventListener implements IUpdateEventListener implements IWindowEventListener {

2
lime/app/IRenderEventListener.hx → lime/graphics/IRenderEventListener.hx
View File

@@ -1,4 +1,4 @@
package lime.app; package lime.graphics;
interface IRenderEventListener { interface IRenderEventListener {

2
lime/app/RenderEvent.hx → lime/graphics/RenderEvent.hx
View File

@@ -1,4 +1,4 @@
package lime.app; package lime.graphics;
class RenderEvent { class RenderEvent {

2
lime/app/RenderEventManager.hx → lime/graphics/RenderEventManager.hx
View File

@@ -1,4 +1,4 @@
package lime.app; package lime.graphics;
import lime.system.System; import lime.system.System;

3
lime/app/Renderer.hx → lime/graphics/Renderer.hx
View File

@@ -1,7 +1,8 @@
package lime.app; package lime.graphics;
import lime.system.System; import lime.system.System;
import lime.ui.Window;
class Renderer { class Renderer {

3
lime/app/Window.hx → lime/ui/Window.hx
View File

@@ -1,6 +1,7 @@
package lime.app; package lime.ui;
import lime.app.Application;
import lime.system.System; import lime.system.System;

2
project/Build.xml
View File

@@ -48,8 +48,8 @@
</section> </section>
<file name="src/app/RenderEvent.cpp" />
<file name="src/app/UpdateEvent.cpp" /> <file name="src/app/UpdateEvent.cpp" />
<file name="src/graphics/RenderEvent.cpp" />
<file name="src/ui/KeyEvent.cpp" /> <file name="src/ui/KeyEvent.cpp" />
<file name="src/ui/MouseEvent.cpp" /> <file name="src/ui/MouseEvent.cpp" />
<file name="src/ui/TouchEvent.cpp" /> <file name="src/ui/TouchEvent.cpp" />

4
project/include/app/RenderEvent.h → project/include/graphics/RenderEvent.h
View File

@@ -1,5 +1,5 @@
#ifndef LIME_APP_RENDER_EVENT_H #ifndef LIME_GRAPHICS_RENDER_EVENT_H
#define LIME_APP_RENDER_EVENT_H #define LIME_GRAPHICS_RENDER_EVENT_H
#include <hx/CFFI.h> #include <hx/CFFI.h>

6
project/include/app/Renderer.h → project/include/graphics/Renderer.h
View File

@@ -1,8 +1,8 @@
#ifndef LIME_APP_RENDERER_H #ifndef LIME_GRAPHICS_RENDERER_H
#define LIME_APP_RENDERER_H #define LIME_GRAPHICS_RENDERER_H
#include <app/Window.h> #include <ui/Window.h>
namespace lime { namespace lime {

4
project/include/app/Window.h → project/include/ui/Window.h
View File

@@ -1,5 +1,5 @@
#ifndef LIME_APP_WINDOW_H #ifndef LIME_UI_WINDOW_H
#define LIME_APP_WINDOW_H #define LIME_UI_WINDOW_H
#include <app/Application.h> #include <app/Application.h>

6
project/src/ExternalInterface.cpp
View File

@@ -9,13 +9,13 @@
#include <hx/CFFI.h> #include <hx/CFFI.h>
#include <app/Application.h> #include <app/Application.h>
#include <app/Renderer.h>
#include <app/RenderEvent.h>
#include <app/UpdateEvent.h> #include <app/UpdateEvent.h>
#include <app/Window.h> #include <graphics/Renderer.h>
#include <graphics/RenderEvent.h>
#include <ui/KeyEvent.h> #include <ui/KeyEvent.h>
#include <ui/MouseEvent.h> #include <ui/MouseEvent.h>
#include <ui/TouchEvent.h> #include <ui/TouchEvent.h>
#include <ui/Window.h>
#include <ui/WindowEvent.h> #include <ui/WindowEvent.h>

43
project/src/app/RenderEvent.cpp
View File

@@ -1,43 +0,0 @@
#include <hx/CFFI.h>
#include <app/RenderEvent.h>
namespace lime {
AutoGCRoot* RenderEvent::callback = 0;
AutoGCRoot* RenderEvent::eventObject = 0;
//static int id_type;
//static bool init = false;
RenderEvent::RenderEvent () {
type = RENDER;
}
void RenderEvent::Dispatch (RenderEvent* event) {
if (RenderEvent::callback) {
//if (!init) {
//id_type = val_id ("type");
//}
value object = (RenderEvent::eventObject ? RenderEvent::eventObject->get () : alloc_empty_object ());
//alloc_field (object, id_type, alloc_int (event->type));
val_call1 (RenderEvent::callback->get (), object);
}
}
}

2
project/src/backend/sdl/SDLApplication.h
View File

@@ -4,8 +4,8 @@
#include <SDL.h> #include <SDL.h>
#include <app/Application.h> #include <app/Application.h>
#include <app/RenderEvent.h>
#include <app/UpdateEvent.h> #include <app/UpdateEvent.h>
#include <graphics/RenderEvent.h>
#include <ui/KeyEvent.h> #include <ui/KeyEvent.h>
#include <ui/MouseEvent.h> #include <ui/MouseEvent.h>
#include <ui/TouchEvent.h> #include <ui/TouchEvent.h>

2
project/src/backend/sdl/SDLRenderer.h
View File

@@ -3,7 +3,7 @@
#include <SDL.h> #include <SDL.h>
#include <app/Renderer.h> #include <graphics/Renderer.h>
namespace lime { namespace lime {

2
project/src/backend/sdl/SDLWindow.h
View File

@@ -3,7 +3,7 @@
#include <SDL.h> #include <SDL.h>
#include <app/Window.h> #include <ui/Window.h>
namespace lime { namespace lime {