Changeset 436 for branches/thune

Timestamp:

07/25/07 22:34:46 (16 months ago)

Author:

krobillard

Message:

GL test framework changed so F9 now reloads script.

Location:

branches/thune/thread_safe/gl

Files:

• boot.c (modified) (1 diff)
• gx.t (modified) (1 diff)
• gx_atoms.h (modified) (1 diff)
• scripts/fbo.t (modified) (1 diff)
• scripts/shadow.t (modified) (1 diff)
• scripts/view.t (modified) (3 diffs)
• testfw.t (moved) (moved from branches/thune/thread_safe/gl/test_fw.t) (5 diffs)

branches/thune/thread_safe/gl/boot.c

@@ -29 +29 @@
   "]\n"
   "context :widget-proto\n"
+  "script-env/os [\n"
+  "    linux [$100 :mouse-lb\n"
+  "        $200 :mouse-mb\n"
+  "        $400 :mouse-rb]\n"
+  "    [1 :mouse-lb\n"
+  "        2 :mouse-rb\n"
+  "        3 :mouse-mb]\n"
+  "] case\n"
   "[\n"
   "    copy\n"

branches/thune/thread_safe/gl/gx.t

@@ -68 +68 @@
 context :hit-input
 */
+
+
+script-env/os [
+    linux [$100 :mouse-lb
+           $200 :mouse-mb
+           $400 :mouse-rb]
+    [1 :mouse-lb
+     2 :mouse-rb
+     3 :mouse-mb]
+] case
+
 
 [

branches/thune/thread_safe/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               317
-#define UR_ATOM_WIDTH           318
-#define UR_ATOM_HEIGHT          319
-#define UR_ATOM_AREA            320
-#define UR_ATOM_RECT            321
-#define UR_ATOM_RASTER          322
-#define UR_ATOM_TEXTURE         323
-#define UR_ATOM_ELEM            324
-#define UR_ATOM_CLOSE           177
-#define UR_ATOM_FOCUS           325
-#define UR_ATOM_RESIZE          326
-#define UR_ATOM_KEY_DOWN                327
-#define UR_ATOM_KEY_UP          328
-#define UR_ATOM_MOUSE_MOVE              329
-#define UR_ATOM_MOUSE_UP                330
-#define UR_ATOM_MOUSE_DOWN              331
-#define UR_ATOM_MOUSE_WHEEL             332
-#define UR_ATOM_AMBIENT         333
-#define UR_ATOM_DIFFUSE         334
-#define UR_ATOM_SPECULAR                335
-#define UR_ATOM_POS             336
-#define UR_ATOM_SHADER          337
-#define UR_ATOM_VERTEX          338
-#define UR_ATOM_FRAGMENT                339
-#define UR_ATOM_DEFAULT         340
-#define UR_ATOM_WAIT            341
-#define UR_ATOM_RGB             342
-#define UR_ATOM_RGBA            343
-#define UR_ATOM_DEPTH           344
-#define UR_ATOM_CLAMP           345
-#define UR_ATOM_REPEAT          346
-#define UR_ATOM_NEAREST         347
-#define UR_ATOM_LINEAR          348
-#define UR_ATOM_MIN             349
-#define UR_ATOM_MAG             350
-#define UR_ATOM_MIPMAP          351
-#define UR_ATOM_ON              256
-#define UR_ATOM_OFF             258
-#define UR_ATOM_ADD             196
-#define UR_ATOM_BURN            352
-#define UR_ATOM_COLOR           353
-#define UR_ATOM_TRANS           354
-#define UR_ATOM_SPRITE          355
+#define UR_ATOM_DRAW_LIST_OPCODES               319
+#define UR_ATOM_WIDTH           320
+#define UR_ATOM_HEIGHT          321
+#define UR_ATOM_AREA            322
+#define UR_ATOM_RECT            323
+#define UR_ATOM_RASTER          324
+#define UR_ATOM_TEXTURE         325
+#define UR_ATOM_ELEM            326
+#define UR_ATOM_CLOSE           179
+#define UR_ATOM_FOCUS           327
+#define UR_ATOM_RESIZE          328
+#define UR_ATOM_KEY_DOWN                329
+#define UR_ATOM_KEY_UP          330
+#define UR_ATOM_MOUSE_MOVE              331
+#define UR_ATOM_MOUSE_UP                332
+#define UR_ATOM_MOUSE_DOWN              333
+#define UR_ATOM_MOUSE_WHEEL             334
+#define UR_ATOM_AMBIENT         335
+#define UR_ATOM_DIFFUSE         336
+#define UR_ATOM_SPECULAR                337
+#define UR_ATOM_POS             338
+#define UR_ATOM_SHADER          339
+#define UR_ATOM_VERTEX          340
+#define UR_ATOM_FRAGMENT                341
+#define UR_ATOM_DEFAULT         342
+#define UR_ATOM_WAIT            343
+#define UR_ATOM_RGB             344
+#define UR_ATOM_RGBA            345
+#define UR_ATOM_DEPTH           346
+#define UR_ATOM_CLAMP           347
+#define UR_ATOM_REPEAT          348
+#define UR_ATOM_NEAREST         349
+#define UR_ATOM_LINEAR          350
+#define UR_ATOM_MIN             351
+#define UR_ATOM_MAG             352
+#define UR_ATOM_MIPMAP          353
+#define UR_ATOM_ON              258
+#define UR_ATOM_OFF             260
+#define UR_ATOM_ADD             198
+#define UR_ATOM_BURN            354
+#define UR_ATOM_COLOR           355
+#define UR_ATOM_TRANS           356
+#define UR_ATOM_SPRITE          357

branches/thune/thread_safe/gl/scripts/fbo.t

@@ -1 +1 @@
 ; Thune GL Framebuffer Object Test
 
-
-"test_fw.t" load do
 
 128,128 :fb-size

branches/thune/thread_safe/gl/scripts/shadow.t

@@ -1 +1 @@
 ; Shadowmap Test
-
-
-"test_fw.t" load do
 
 

branches/thune/thread_safe/gl/scripts/view.t

@@ -1 +1 @@
 ; Thune GL View
 
-<
- "test_fw.t" load do
- "scripts/stars.t" load do
->
+<"scripts/stars.t" load do>
 
 0.6 :zoom
-10,0,10 :bg-color
+10,0,10 'bg-color set
 ;off key-repeat
 0.0,0 :win-size
@@ -176 +173 @@
     now start-time sub :flare-sh/time
 ]
-proc :sim-update
+proc 'sim-update set
 
 
@@ -231 +228 @@
         ]
         f1  [help none help-dl either :help]
+        f9  ['reload throw]
         f10 [display.snapshot "snapshot.png" save.png]
     ]

branches/thune/thread_safe/gl/testfw.t

@@ -1 +1 @@
 ; Thune GL Test Harness
 
-script-env/os [
-    linux [$100 :mouse-lb
-           $200 :mouse-mb
-           $400 :mouse-rb]
-    [1 :mouse-lb
-     2 :mouse-rb
-     3 :mouse-mb]
-] case
+
+args empty? ift ("Specify script to run" print)
+args/1 full-path :script-file
 
 
@@ -62 +57 @@
 
 [] proc :sim-update
+1.0 :zoom
+0,0,155 :bg-color
 
-0,0,155 :bg-color
+
+[
+    [
+        recycle
+        script-file load context drop
+    ]
+    [dup 'reload if/eq (drop recurse)] try
+]
+proc :run-script     ; ( -- )
+
 
 [wid]
 [
-    recycle
+    ;recycle
     bg-color display.swap
     [
@@ -82 +88 @@
 
 
-1.0 :zoom
-
 [dlist]
 [
@@ -89 +93 @@
         key-down [
             esc [quit]
+            f9  ['reload throw]
             f10 [display.snapshot "snapshot.png" save.png]
         ]
@@ -118 +123 @@
 
 
+run-script
+
+
 ;eof