Changeset 321 for trunk/tests/gui_test

Timestamp:

08/25/14 02:43:30 (11 years ago)

Author:

epyon

Message:

• updated all tests to new nova
• cleaned up tests paths
• general cleanup of tests and test data

Location:

trunk/tests/gui_test

Files:

• gui_test.lua (modified) (1 diff)
• nv_gui_test.cc (modified) (4 diffs)
• premake4.lua (modified) (1 diff)

trunk/tests/gui_test/gui_test.lua

@@ -4 +4 @@
         includedirs { "../../" }
         targetname "nv_gui_test"
-        links { "nv" }
+        links { "nv-core", "nv-gl", "nv-gui" }
+        targetdir "../../bin"   
  

trunk/tests/gui_test/nv_gui_test.cc

@@ -4 +4 @@
 #include <nv/core/logging.hh>
 #include <nv/core/logger.hh>
-#include <cstdlib> // rand
-#include <ctime> // time
+#include <nv/core/random.hh>
 
 class application
@@ -84 +83 @@
 void application::spawn_window()
 {
-        glm::ivec2 a( std::rand() % 600, std::rand() % 400 );
-        glm::ivec2 b( std::rand() % 200 + 40, std::rand() % 200 + 40 );
+        nv::ivec2 a = nv::random::get().range( nv::ivec2(), nv::ivec2( 600, 400 ) );
+        nv::ivec2 b = nv::random::get().range( nv::ivec2( 40, 40 ), nv::ivec2( 240, 240 ) );
         nv::gui::handle e = m_guienv->create_element( nv::rectangle(a).dim(b) );
         m_guienv->set_class( e, "window" );
@@ -96 +95 @@
 {
         if ( m_windows.size() == 0 ) return;
-        size_t index = rand() % m_windows.size();
+        size_t index = nv::random::get().urand( m_windows.size() );
         m_guienv->destroy_element( m_windows[index] );
         m_windows.erase( m_windows.begin() + index );
@@ -118 +117 @@
 int main(int, char* [])
 {
-        std::srand((unsigned int) std::time(0) );
+        nv::random::get().randomize();
         nv::logger log(nv::LOG_TRACE);
         log.add_sink( new nv::log_file_sink("log.txt"), nv::LOG_TRACE );

trunk/tests/gui_test/premake4.lua

@@ -5 +5 @@
         flags { "ExtraWarnings", "NoPCH" }
 
-        configuration "gmake"   
-                buildoptions "-std=c++11"
-
         configuration "debug"
                 defines { "DEBUG" }
                 flags { "Symbols", "StaticRuntime" }
-                objdir (_ACTION.."/debug")
+                objdir ("../../".._ACTION.."/debug")
 
         configuration "release"
                 defines { "NDEBUG" }
                 flags { "Optimize", "StaticRuntime" }
-                objdir (_ACTION.."/release")
+                objdir ("../../".._ACTION.."/release")
 
         dofile("gui_test.lua")
         dofile("../../nv.lua")
-
-if _ACTION == "clean" then
-        for action in premake.action.each() do
-                os.rmdir(action.trigger)
-        end
-end