some refactoring

src/framework/CMakeLists.txt

@@ -173,6 +173,8 @@ SET(framework_SOURCES ${framework_SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/core/configmanager.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/configmanager.h
     ${CMAKE_CURRENT_LIST_DIR}/core/declarations.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/event.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/event.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/eventdispatcher.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/eventdispatcher.h
     ${CMAKE_CURRENT_LIST_DIR}/core/filestream.cpp
@@ -186,6 +188,8 @@ SET(framework_SOURCES ${framework_SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/core/modulemanager.h
     ${CMAKE_CURRENT_LIST_DIR}/core/resourcemanager.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/resourcemanager.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/scheduledevent.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/scheduledevent.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/timer.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/timer.h
 

src/framework/core/configmanager.cpp

@@ -45,7 +45,7 @@ bool ConfigManager::load(const std::string& file)
             m_confsDoc = confsDoc;
         return true;
     } catch(stdext::exception& e) {
-        g_logger.error(stdext::format("Unable to parse configuration file '%s'", e.what()));
+        g_logger.error(stdext::format("Unable to parse configuration file '%s': ", e.what()));
         return false;
     }
 }
@@ -121,10 +121,10 @@ void ConfigManager::remove(const std::string& key)
 void ConfigManager::setNode(const std::string& key, const OTMLNodePtr& node)
 {
     remove(key);
-    addNode(key, node);
+    mergeNode(key, node);
 }
 
-void ConfigManager::addNode(const std::string& key, const OTMLNodePtr& node)
+void ConfigManager::mergeNode(const std::string& key, const OTMLNodePtr& node)
 {
     OTMLNodePtr clone = node->clone();
     node->setTag(key);

src/framework/core/configmanager.h

@@ -40,7 +40,7 @@ public:
     std::vector<std::string> getList(const std::string& key);
 
     void setNode(const std::string& key, const OTMLNodePtr& node);
-    void addNode(const std::string& key, const OTMLNodePtr& node);
+    void mergeNode(const std::string& key, const OTMLNodePtr& node);
     OTMLNodePtr getNode(const std::string& key);
 
     bool exists(const std::string& key);

src/framework/core/eventdispatcher.cpp

@@ -27,6 +27,7 @@
 
 EventDispatcher g_eventDispatcher;
 
+
 void EventDispatcher::flush()
 {
     while(!m_eventList.empty())

src/framework/core/eventdispatcher.h

@@ -23,92 +23,8 @@
 #ifndef EVENTDISPATCHER_H
 #define EVENTDISPATCHER_H
 
-#include "declarations.h"
 #include "clock.h"
-#include <framework/luascript/luaobject.h>
-
-class Event : public LuaObject
-{
-public:
-    Event(const std::function<void()>& callback) : m_callback(callback), m_canceled(false), m_executed(false) { }
-    virtual ~Event() {
-        // assure that we lost callback refs
-        //assert(m_callback == nullptr);
-    }
-
-    virtual void execute() {
-        if(!m_canceled && !m_executed && m_callback) {
-            m_callback();
-            m_executed = true;
-        }
-
-        // reset callback to free object refs
-        m_callback = nullptr;
-    }
-    void cancel() {
-        m_canceled = true;
-        m_callback = nullptr;
-    }
-
-    bool isCanceled() { return m_canceled; }
-    bool isExecuted() { return m_executed; }
-
-protected:
-    std::function<void()> m_callback;
-    bool m_canceled;
-    bool m_executed;
-};
-
-class ScheduledEvent : public Event
-{
-public:
-    ScheduledEvent(const std::function<void()>& callback, int delay, int maxCycles) : Event(callback) {
-        m_ticks = g_clock.millis() + delay;
-        m_delay = delay;
-        m_maxCycles = maxCycles;
-        m_cyclesExecuted = 0;
-    }
-
-    void execute() {
-        if(!m_canceled && m_callback && (m_maxCycles == 0 || m_cyclesExecuted < m_maxCycles)) {
-            m_callback();
-            m_executed = true;
-            // callback may be used in the next cycle
-        } else {
-            // reset callback to free object refs
-            m_callback = nullptr;
-        }
-        m_cyclesExecuted++;
-    }
-
-    bool nextCycle() {
-        if(m_callback && !m_canceled && (m_maxCycles == 0 || m_cyclesExecuted < m_maxCycles)) {
-            m_ticks += m_delay;
-            return true;
-        }
-        // reset callback to free object refs
-        m_callback = nullptr;
-        return false;
-    }
-
-    int ticks() { return m_ticks; }
-    int reamaningTicks() { return m_ticks - g_clock.millis(); }
-    int delay() { return m_delay; }
-    int cyclesExecuted() { return m_cyclesExecuted; }
-    int maxCycles() { return m_maxCycles; }
-
-private:
-    ticks_t m_ticks;
-    int m_delay;
-    int m_maxCycles;
-    int m_cyclesExecuted;
-};
-
-struct lessScheduledEvent : std::binary_function<ScheduledEventPtr, ScheduledEventPtr&, bool> {
-    bool operator()(const ScheduledEventPtr& a, const ScheduledEventPtr& b) {
-        return  b->ticks() < a->ticks();
-    }
-};
+#include "scheduledevent.h"
 
 class EventDispatcher
 {

src/framework/core/filestream.cpp

@@ -21,118 +21,101 @@
  */
 
 #include "filestream.h"
+#include <framework/application.h>
 
 #include <physfs.h>
 
 FileStream::FileStream(const std::string& name, PHYSFS_File *fileHandle)
 {
     m_name = name;
+    m_pos = 0;
     m_fileHandle = fileHandle;
-    m_cacheReadPos = 0;
 }
 
 FileStream::~FileStream()
 {
+    assert(!g_app.isTermianted());
     close();
 }
 
 void FileStream::cache()
 {
     if(!m_fileHandle)
-        g_logger.traceError("no file handle to cache");
+        return;
 
-    // cache entire file into cache buffer
-    m_cacheReadPos = PHYSFS_tell(m_fileHandle);
+    // cache entire file into data buffer
+    m_pos = PHYSFS_tell(m_fileHandle);
     PHYSFS_seek(m_fileHandle, 0);
     int size = PHYSFS_fileLength(m_fileHandle);
-    m_cacheBuffer.resize(size);
-    int res = PHYSFS_read(m_fileHandle, &m_cacheBuffer[0], size, 1);
+    m_data.resize(size);
+    int res = PHYSFS_read(m_fileHandle, &m_data[0], size, 1);
     if(res == -1)
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+        throwError("unable to read file data");
 
-    PHYSFS_close(m_fileHandle);
-    m_fileHandle = nullptr;
+    close();
 }
 
-bool FileStream::close()
+void FileStream::close()
 {
     if(m_fileHandle) {
-        if(PHYSFS_isInit() && PHYSFS_close(m_fileHandle) == 0)
-            g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
-
+        if(!PHYSFS_close(m_fileHandle))
+            throwError("close failed");
         m_fileHandle = nullptr;
-        return true;
     } else {
-        m_cacheBuffer.clear();
-        m_cacheReadPos = 0;
-        return true;
+        m_data.clear();
+        m_pos = 0;
     }
 }
 
-bool FileStream::flush()
+void FileStream::flush()
 {
-    if(!m_fileHandle)
-        return false;
-
-    if(PHYSFS_flush(m_fileHandle) == 0) {
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
-        return false;
-    }
-    return true;
+    if(m_fileHandle && PHYSFS_flush(m_fileHandle) == 0)
+        throwError("flush failed");
 }
 
-int FileStream::read(void *buffer, int size, int nmemb)
+int FileStream::read(void *buffer, uint32 size, uint32 nmemb)
 {
     if(m_fileHandle) {
         int res = PHYSFS_read(m_fileHandle, buffer, size, nmemb);
-        if(res == -1) {
-            g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
-            return 0;
-        }
+        if(res == -1)
+            throwError("read failed");
         return res;
     } else {
-        uint maxReadPos = m_cacheBuffer.size()-1;
+        uint maxReadPos = m_data.size()-1;
         int writePos = 0;
         uint8 *outBuffer = (uint8*)buffer;
-        for(int i=0;i<nmemb;++i) {
-            if(m_cacheReadPos+size > maxReadPos)
+        for(uint i=0;i<nmemb;++i) {
+            if(m_pos+size > maxReadPos)
                 return i;
 
-            for(int j=0;j<size;++j)
-                outBuffer[writePos++] = m_cacheBuffer[m_cacheReadPos++];
+            for(uint j=0;j<size;++j)
+                outBuffer[writePos++] = m_data[m_pos++];
         }
         return nmemb;
     }
 }
 
-bool FileStream::write(void *buffer, int count)
+void FileStream::write(void *buffer, uint32 count)
 {
-    if(!m_fileHandle)
-        return false;
-
-    if(PHYSFS_write(m_fileHandle, buffer, 1, count) != count) {
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
-        return false;
-    }
-
-    return true;
+    if(PHYSFS_write(m_fileHandle, buffer, 1, count) != count)
+        throwError("write failed");
 }
 
-bool FileStream::seek(int pos)
+void FileStream::seek(uint32 pos)
 {
     if(m_fileHandle) {
-        if(PHYSFS_seek(m_fileHandle, pos) == 0) {
-            g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
-            return false;
-        }
+        if(!PHYSFS_seek(m_fileHandle, pos))
+            throwError("seek failed");
     } else {
-        if(pos > (int)m_cacheBuffer.size() || pos < 0) {
-            g_logger.traceError(stdext::format("operation failed on '%s': seek pos cannot be greater than file length", m_name));
-            return false;
-        }
-        m_cacheReadPos = pos;
+        if(pos > m_data.size())
+            throwError("seek failed");
+        m_pos = pos;
     }
-    return true;
+}
+
+void FileStream::skip(uint len)
+{
+    seek(tell() + len);
 }
 
 int FileStream::size()
@@ -140,7 +123,7 @@ int FileStream::size()
     if(m_fileHandle)
         return PHYSFS_fileLength(m_fileHandle);
     else
-        return m_cacheBuffer.size();
+        return m_data.size();
 }
 
 int FileStream::tell()
@@ -148,7 +131,7 @@ int FileStream::tell()
     if(m_fileHandle)
         return PHYSFS_tell(m_fileHandle);
     else
-        return m_cacheReadPos;
+        return m_pos;
 }
 
 uint8 FileStream::getU8()
@@ -156,15 +139,13 @@ uint8 FileStream::getU8()
     uint8 v = 0;
     if(m_fileHandle) {
         if(PHYSFS_read(m_fileHandle, &v, 1, 1) != 1)
-            g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+            throwError("read failed");
     } else {
-        if(m_cacheReadPos+1 > m_cacheBuffer.size()) {
-            g_logger.traceError(stdext::format("operation failed on '%s': reached file eof", m_name));
-            return 0;
-        }
+        if(m_pos+1 > m_data.size())
+            throwError("read failed");
 
-        v = m_cacheBuffer[m_cacheReadPos];
-        m_cacheReadPos += 1;
+        v = m_data[m_pos];
+        m_pos += 1;
     }
     return v;
 }
@@ -174,15 +155,13 @@ uint16 FileStream::getU16()
     uint16 v = 0;
     if(m_fileHandle) {
         if(PHYSFS_readULE16(m_fileHandle, &v) == 0)
-            g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+            throwError("read failed");
     } else {
-        if(m_cacheReadPos+2 > m_cacheBuffer.size()) {
-            g_logger.traceError(stdext::format("operation failed on '%s': reached file eof", m_name));
-            return 0;
-        }
+        if(m_pos+2 > m_data.size())
+            throwError("read failed");
 
-        v = stdext::readLE16(&m_cacheBuffer[m_cacheReadPos]);
-        m_cacheReadPos += 2;
+        v = stdext::readLE16(&m_data[m_pos]);
+        m_pos += 2;
     }
     return v;
 }
@@ -192,15 +171,13 @@ uint32 FileStream::getU32()
     uint32 v = 0;
     if(m_fileHandle) {
         if(PHYSFS_readULE32(m_fileHandle, &v) == 0)
-            g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+            throwError("read failed");
     } else {
-        if(m_cacheReadPos+4 > m_cacheBuffer.size()) {
-            g_logger.traceError(stdext::format("operation failed on '%s': reached file eof", m_name));
-            return 0;
-        }
+        if(m_pos+4 > m_data.size())
+            throwError("read failed");
 
-        v = stdext::readLE32(&m_cacheBuffer[m_cacheReadPos]);
-        m_cacheReadPos += 4;
+        v = stdext::readLE32(&m_data[m_pos]);
+        m_pos += 4;
     }
     return v;
 }
@@ -210,15 +187,12 @@ uint64 FileStream::getU64()
     uint64 v = 0;
     if(m_fileHandle) {
         if(PHYSFS_readULE64(m_fileHandle, (PHYSFS_uint64*)&v) == 0)
-            g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+            throwError("read failed");
     } else {
-        if(m_cacheReadPos+8 > m_cacheBuffer.size()) {
-            g_logger.traceError(stdext::format("operation failed on '%s': reached file eof", m_name));
-            return 0;
-        }
-
-        v = stdext::readLE64(&m_cacheBuffer[m_cacheReadPos]);
-        m_cacheReadPos += 8;
+        if(m_pos+8 > m_data.size())
+            throwError("read failed");
+        v = stdext::readLE64(&m_data[m_pos]);
+        m_pos += 8;
     }
     return v;
 }
@@ -235,66 +209,47 @@ std::string FileStream::getString()
             else
                 str = std::string(buffer, len);
         } else {
-            if(m_cacheReadPos+len > m_cacheBuffer.size()) {
+            if(m_pos+len > m_data.size()) {
                 g_logger.traceError(stdext::format("operation failed on '%s': reached file eof", m_name));
                 return 0;
             }
 
-            str = std::string((char*)&m_cacheBuffer[m_cacheReadPos], len);
-            m_cacheReadPos += len;
+            str = std::string((char*)&m_data[m_pos], len);
+            m_pos += len;
         }
     } else {
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
     }
     return str;
 }
 
-uint8 FileStream::readFirstNode(uint32& type)
-{
-    dump << "first";
-    uint8 node = getU8();
-    if(node != NODE_START)
-        stdext::throw_exception("failed to read first node");
-    type = getU32();
-    return node;
-}
-
-uint8 FileStream::readNextNode(uint8 oldNode, uint32& type)
-{
-    dump << "next";
-    // end of old node
-    if(getU8() != NODE_END)
-        stdext::throw_exception("node not ended");
-
-    // next node
-    uint8 node = getU8();
-    if(oldNode != NODE_START)
-        stdext::throw_exception("invalid node start");
-
-    type = getU32();
-    return node;
-}
-
 void FileStream::addU8(uint8 v)
 {
     if(PHYSFS_write(m_fileHandle, &v, 1, 1) != 1)
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+        throwError("write failed");
 }
 
 void FileStream::addU16(uint8 v)
 {
     if(PHYSFS_writeULE16(m_fileHandle, v) == 0)
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+        throwError("write failed");
 }
 
 void FileStream::addU32(uint8 v)
 {
     if(PHYSFS_writeULE32(m_fileHandle, v) == 0)
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+        throwError("write failed");
 }
 
 void FileStream::addU64(uint8 v)
 {
     if(PHYSFS_writeULE64(m_fileHandle, v) == 0)
-        g_logger.traceError(stdext::format("operation failed on '%s': %s", m_name, PHYSFS_getLastError()));
+        throwError("write failed");
+}
+
+void FileStream::throwError(const std::string& message)
+{
+    std::string completeMessage = stdext::format("in file '%s': %s", m_name, message);
+    if(m_fileHandle)
+        completeMessage += std::string(": ") + PHYSFS_getLastError();
+    stdext::throw_exception(completeMessage);
 }

src/framework/core/filestream.h

@@ -29,26 +29,17 @@ struct PHYSFS_File;
 
 class FileStream
 {
-    enum  {
-        NODE_START = 0xFE,
-        NODE_END = 0xFF,
-        ESCAPE_CHAR = 0xFD,
-    };
-
-protected:
-    FileStream(const std::string& name, PHYSFS_File *fileHandle);
-
-    friend class ResourceManager;
-
 public:
+    FileStream(const std::string& name, PHYSFS_File *fileHandle);
     ~FileStream();
 
     void cache();
-    bool close();
-    bool flush();
-    bool write(void *buffer, int count);
-    int read(void *buffer, int size, int nmemb = 1);
-    bool seek(int pos);
+    void close();
+    void flush();
+    void write(void *buffer, uint count);
+    int read(void *buffer, uint size, uint nmemb = 1);
+    void seek(uint pos);
+    void skip(uint len);
     int size();
     int tell();
     std::string name() { return m_name; }
@@ -60,20 +51,21 @@ public:
     uint32 getU32();
     uint64 getU64();
     std::string getString();
+
     void addU8(uint8 v);
     void addU16(uint8 v);
     void addU32(uint8 v);
     void addU64(uint8 v);
 
-    uint8 readFirstNode(uint32& type);
-    uint8 readNextNode(uint8 oldNode, uint32& type);
-
 private:
+    void checkWrite();
+    void throwError(const std::string& message);
+
     std::string m_name;
     PHYSFS_File *m_fileHandle;
 
-    std::vector<uint8_t> m_cacheBuffer;
-    uint m_cacheReadPos;
+    std::vector<uint8_t> m_data;
+    uint m_pos;
 };
 
 #endif

src/framework/luafunctions.cpp

@@ -521,7 +521,7 @@ void Application::registerLuaFunctions()
     g_lua.bindSingletonFunction("g_configs", "exists", &ConfigManager::exists, &g_configs);
     g_lua.bindSingletonFunction("g_configs", "remove", &ConfigManager::remove, &g_configs);
     g_lua.bindSingletonFunction("g_configs", "setNode", &ConfigManager::setNode, &g_configs);
-    g_lua.bindSingletonFunction("g_configs", "addNode", &ConfigManager::addNode, &g_configs);
+    g_lua.bindSingletonFunction("g_configs", "mergeNode", &ConfigManager::mergeNode, &g_configs);
     g_lua.bindSingletonFunction("g_configs", "getNode", &ConfigManager::getNode, &g_configs);
 
     // PlatformWindow

src/framework/sound/oggsoundfile.cpp

@@ -87,17 +87,14 @@ int OggSoundFile::cb_seek(void* source, ogg_int64_t offset, int whence)
     FileStream *file = static_cast<FileStream*>(source);
     switch(whence) {
         case SEEK_SET:
-            if(file->seek(offset))
-                return 0;
-            break;
+            file->seek(offset);
+            return 0;
         case SEEK_CUR:
-            if(file->seek(file->tell() + offset))
-                return 0;
-            break;
+            file->seek(file->tell() + offset);
+            return 0;
         case SEEK_END:
-            if(file->seek(file->size() + offset))
-                return 0;
-            break;
+            file->seek(file->size() + offset);
+            return 0;
     }
     return -1;
 }

src/framework/sound/soundbuffer.cpp

@@ -46,7 +46,7 @@ bool SoundBuffer::fillBuffer(const SoundFilePtr& soundFile)
 
     DataBuffer<char> samples(soundFile->getSize());
     int read = soundFile->read(&samples[0], soundFile->getSize());
-    if(read <= 0) {
+    if(read == 0) {
         g_logger.error(stdext::format("unable to fill audio buffer data for '%s'", soundFile->getName()));
         return false;
     }