Changeset 3478 for trunk

Timestamp:

Mar 8, 2013 8:07:21 PM (11 years ago)

Author:

ldelgass

Message:

Add background color protocol command to nanovis, also change resize protocol
to use 'size', so new commands are:

screen bgcolor r g b
screen size width height

Location:

trunk

Files:

• gui/scripts/flowvisviewer.tcl (modified) (1 diff)
• gui/scripts/nanovisviewer.tcl (modified) (1 diff)
• packages/vizservers/nanovis/Command.cpp (modified) (3 diffs)
• packages/vizservers/nanovis/nanovis.cpp (modified) (1 diff)
• packages/vizservers/nanovis/nanovis.h (modified) (1 diff)
• packages/vizservers/nanovis/protocol-nanovis.txt (modified) (2 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -2622 +2622 @@
 itcl::body Rappture::FlowvisViewer::Resize {} {
     $_arcball resize $_width $_height
-    SendCmd "screen $_width $_height"
+    SendCmd "screen size $_width $_height"
     set _resizePending 0
 }

trunk/gui/scripts/nanovisviewer.tcl

@@ -2039 +2039 @@
 itcl::body Rappture::NanovisViewer::DoResize {} {
     $_arcball resize $_width $_height
-    SendCmd "screen $_width $_height"
+    SendCmd "screen size $_width $_height"
     set _resizePending 0
 }

trunk/packages/vizservers/nanovis/Command.cpp

@@ -885 +885 @@
 }
 
+static int
+ScreenBgColorOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                Tcl_Obj *const *objv)
+{
+    float rgb[3];
+    if ((GetFloatFromObj(interp, objv[2], &rgb[0]) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[3], &rgb[1]) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[4], &rgb[2]) != TCL_OK)) {
+        return TCL_ERROR;
+    }
+    NanoVis::setBgColor(rgb);
+    return TCL_OK;
+}
+
 /*
  * ----------------------------------------------------------------------
  * CLIENT COMMAND:
- *   screen <width> <height>
+ *   screen size <width> <height>
  *
  * Clients send this command to set the size of the rendering area.
@@ -895 +909 @@
  */
 static int
+ScreenSizeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
+{
+    int w, h;
+    if ((Tcl_GetIntFromObj(interp, objv[2], &w) != TCL_OK) ||
+        (Tcl_GetIntFromObj(interp, objv[3], &h) != TCL_OK)) {
+        return TCL_ERROR;
+    }
+    NanoVis::resizeOffscreenBuffer(w, h);
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec screenOps[] = {
+    {"bgcolor",  1, ScreenBgColorOp,  5, 5, "r g b",},
+    {"size",     1, ScreenSizeOp, 4, 4, "width height",},
+};
+static int nScreenOps = NumCmdSpecs(screenOps);
+
+static int
 ScreenCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-          Tcl_Obj *const *objv)
-{
-    if (objc != 3) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"",
-                         Tcl_GetString(objv[0]), " width height\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-
-    int w, h;
-    if ((Tcl_GetIntFromObj(interp, objv[1], &w) != TCL_OK) ||
-        (Tcl_GetIntFromObj(interp, objv[2], &h) != TCL_OK)) {
-        return TCL_ERROR;
-    }
-    NanoVis::resizeOffscreenBuffer(w, h);
-    return TCL_OK;
+          Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nScreenOps, screenOps,
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
 }
 
@@ -2106 +2134 @@
 
     proc = Rappture::GetOpFromObj(interp, nGridOps, gridOps,
-        Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -1573 +1573 @@
 
 void
+NanoVis::setBgColor(float color[3])
+{
+    TRACE("Setting bgcolor to %g %g %g", color[0], color[1], color[2]);
+    glClearColor(color[0], color[1], color[2], 1);
+}
+
+void
 NanoVis::display()
 {

trunk/packages/vizservers/nanovis/nanovis.h

@@ -81 +81 @@
     static void initOffscreenBuffer();
     static void resizeOffscreenBuffer(int w, int h);
+    static void setBgColor(float color[3]);
     static void display();
     static void draw3dAxis();

trunk/packages/vizservers/nanovis/protocol-nanovis.txt

@@ -43 +43 @@
 
 camera angle <xAngle> <yAngle> <zAngle>
+       ** Deprecated, use camera orient **
 camera orient <quatW> <quatX> <quatY> <quatZ>
 camera pan <x> <y>
 camera pos <x> <y> <z>
+camera reset <?all?>
 camera zoom <factor>
 
-screen <width> <height>
-    Set size of rendered images
+screen bgcolor <r> <g> <b>
+       Set screen background color
+screen size <width> <height>
+       Set size of rendered images
+
 snapshot
-    Render a 2k x 2k image (offscreen buffer)
+         Render a 2k x 2k image (offscreen buffer)
 
 transfunc define <name> {colors} {alpha}
@@ -197 +202 @@
 Error Replies:
 ================================================================================
-Prefixed with "NanoVis Server Error: "
-Currently not guaranteed to be on a single line
-================================================================================
+nv>viserror -bytes <nbytes>
+   <multi-line error string of nbytes>
+================================================================================