From 2a58c40341d631da1a2f99e2c814df044f4c813c Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 15 Jul 2009 22:39:23 -0500 Subject: [PATCH] in kazakhstan, they say that a world is like a context-world --- basis/ui/gadgets/worlds/worlds-docs.factor | 3 --- basis/ui/gadgets/worlds/worlds.factor | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/basis/ui/gadgets/worlds/worlds-docs.factor b/basis/ui/gadgets/worlds/worlds-docs.factor index ddaad93b1b..fe662b898c 100755 --- a/basis/ui/gadgets/worlds/worlds-docs.factor +++ b/basis/ui/gadgets/worlds/worlds-docs.factor @@ -29,9 +29,6 @@ HELP: set-title { $description "Sets the title bar of the native window containing the world." } { $notes "This word should not be called directly by user code. Instead, change the " { $snippet "title" } " slot model; see " { $link "models" } "." } ; -HELP: context-world -{ $var-description "Holds the " { $link world } " whose OpenGL context was most recently made active by " { $link set-gl-context } "." } ; - HELP: set-gl-context { $values { "world" world } } { $description "Selects an OpenGL context to be the implicit destination for subsequent GL rendering calls. This word is called automatically by the UI before drawing a " { $link world } "." } ; diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor index 0c59af95d6..91666c4e7a 100755 --- a/basis/ui/gadgets/worlds/worlds.factor +++ b/basis/ui/gadgets/worlds/worlds.factor @@ -78,13 +78,11 @@ TUPLE: world-attributes '[ f _ [ (>>status-owner) ] [ status>> set-model ] 2bi ] when ] [ 2drop ] if ; -SYMBOL: context-world - : window-resource ( resource -- resource ) - dup context-world get-global window-resources>> push ; + dup world get-global window-resources>> push ; : set-gl-context ( world -- ) - [ context-world set-global ] + [ world set-global ] [ handle>> select-gl-context ] bi ; : with-gl-context ( world quot -- )