Changeset 40

Timestamp:

08/30/2007 12:25:04 AM (5 years ago)

Author:

art

Message:

Bindings changed to Packages

Files:

• Bindings (deleted)
• Makefile (modified) (1 diff)
• Packages/glfw (added)
• Packages/glfw/.sconsign (added)
• Packages/glfw/Event.h (added)
• Packages/glfw/EventFactory.hpp (added)
• Packages/glfw/Makefile (added)
• Packages/glfw/Package.cpp (added)
• Packages/glfw/Package.h (added)
• Packages/glfw/Reference.pdf (added)
• Packages/glfw/Task.cpp (added)
• Packages/glfw/Task.h (added)
• Packages/glfw/glew.h (added)
• Packages/glfw/glfw.h (added)
• Packages/glfw/glxew.h (added)
• Packages/glfw/lib (added)
• Packages/glfw/lib/glew32.dll (added)
• Packages/glfw/lib/glfw.dll (added)
• Packages/glfw/lib/libGLEW.a (added)
• Packages/glfw/lib/libGLEW.so.1.3.4 (added)
• Packages/glfw/lib/libglew32.dll.a (added)
• Packages/glfw/lib/libglfw.a (added)
• Packages/glfw/lib/libglfwdll.a (added)
• Packages/glfw/wglew.h (added)
• Packages/glfw/win32-devcpp (added)
• Packages/glfw/win32-devcpp/Makefile.win (added)
• Packages/glfw/win32-devcpp/glfwBinding.dev (added)
• Packages/glfw/win32-devcpp/glfwBinding_private.h (added)
• Packages/glfw/win32-devcpp/glfwBinding_private.rc (added)
• Packages/glfw/win32-devcpp/glfwBinding_private.res (added)
• Test/threadTest/Makefile (modified) (1 diff)
• Test/threadTest/main.cpp (modified) (2 diffs)
• nrEngine/include/Makefile (modified) (1 diff)
• nrEngine/include/nrEngine.h (modified) (1 diff)
• nrEngine/nrEngine.h (modified) (1 diff)
• nrEngine/src/IThread.cpp (modified) (2 diffs)
• nrEngine/src/Kernel.cpp (modified) (1 diff)

Makefile

@@ -2 +2 @@
 include Make/Makedefs
 
-SUBDIRS = nrEngine Bindings Plugins
+SUBDIRS = nrEngine Packages Plugins
 
 include Make/Makedirrules

Test/threadTest/Makefile

@@ -13 +13 @@
 # some definitions
 TARGET = threadTest
-LDFLAGS = -lnrEngine
+LDFLAGS = $(LIBPATH) -lnrEngine
 
 #-----------------------------------------------

Test/threadTest/main.cpp

@@ -21 +21 @@
                 {
                         c++;
-                        float res = 1.0;
-                        if (n == 0)
-                                for (int i=0; i < 10000000; i++)
+                        //float res = 1.0;
+                        if (n == 0){
+                                //for (int i=0; i < 1000000; i++)
                                 {
-                                        res = cos(sin(c) * sin(c) * float(i) / 1000.0);
+                                //      res = cos(sin(c) * sin(c) * float(i) / 1000.0);
                                 }
-
-                        printf("Thread: %d - %d - %f\n", n, c, res);
+                                float startTime = Engine::sClock()->getTime();
+                                while (Engine::sClock()->getTime() < startTime + 2.0){}
+                                printf("0\n");
+                        }
+                        if (n == 1){
+                                float startTime = Engine::sClock()->getTime();
+                                while (Engine::sClock()->getTime() < startTime + 1.0){}
+                                printf("1\n");
+                        }
+                        
+                        printf("Thread: %d - %d\n", n, c);
                         return OK;
                 }
@@ -46 +55 @@
         }
         SharedPtr<ITask> task (new Task(999));
-        Engine::sKernel()->AddTask(task, ORDER_NORMAL);
+        Engine::sKernel()->AddTask(task, ORDER_NORMAL, TASK_IS_THREAD);
         
         // execute the tasks
-        for (int i=0; i < 100000; i++)
+        float startTime = Engine::sClock()->getTime();
+        while (Engine::sClock()->getTime() < startTime + 60.0)
         {
                 Engine::sKernel()->OneTick();

nrEngine/include/Makefile

@@ -51 +51 @@
                         EventFactory.h\
                         SmartPtr.h\
-                        Binding.h\
                         Package.h\
                         GetTime.h\

nrEngine/include/nrEngine.h

@@ -40 +40 @@
 #include "Script.h"
 #include "EventManager.h"
-#include "Binding.h"
 #include "Package.h"
 #include "Event.h"

nrEngine/nrEngine.h

@@ -40 +40 @@
 #include "include/Script.h"
 #include "include/EventManager.h"
-#include "include/Binding.h"
 #include "include/Package.h"
 #include "include/Event.h"

nrEngine/src/IThread.cpp

@@ -50 +50 @@
                 NR_Log(Log::LOG_KERNEL, "IThread: Create thread and start it");
 
+                mThread.reset(new boost::thread(boost::bind(&IThread::run, this)));
                 // initialise the attribute
                 /*pthread_attr_init(&mThreadAttr);
@@ -65 +66 @@
                         return;
                 }*/
+                mThreadState = THREAD_RUNNING;
    
                 mThreadState = THREAD_RUNNING;

nrEngine/src/Kernel.cpp

@@ -134 +134 @@
                 }
 
-                // Now we yield the running thread, so that we get user friendly
-                // thread behaviour.
+                // Now we yield the running thread, so that our system could still 
+                // response
                 IThread::yield();