Changeset 3877 for branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp

Timestamp:

Aug 21, 2013 10:52:23 AM (11 years ago)

Author:

ldelgass

Message:

Merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/RendererCmd.cpp (modified) (3 diffs)

branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -8559 +8559 @@
 
 static int
+ParallelepipedAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    double vec1[3], vec2[3], vec3[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &vec1[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &vec1[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &vec1[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &vec2[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[6], &vec2[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[7], &vec2[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[8], &vec3[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[9], &vec3[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[10], &vec3[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    const char *name = Tcl_GetString(objv[11]);
+    if (!g_renderer->addParallelepiped(name, vec1, vec2, vec3)) {
+        Tcl_AppendResult(interp, "Failed to create parallelepiped", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    if (objc == 3) {
+        const char *name = Tcl_GetString(objv[2]);
+        g_renderer->deleteGraphicsObject<Parallelepiped>(name);
+    } else {
+        g_renderer->deleteGraphicsObject<Parallelepiped>("all");
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedColorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    float color[3];
+    if (GetFloatFromObj(interp, objv[2], &color[0]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[3], &color[1]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[4], &color[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectColor<Parallelepiped>(name, color);
+    } else {
+        g_renderer->setGraphicsObjectColor<Parallelepiped>("all", color);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedCullingOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectCulling<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectCulling<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedEdgeVisibilityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                               Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectEdgeVisibility<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectEdgeVisibility<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedFlipNormalsOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                            Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectFlipNormals<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectFlipNormals<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedLightingOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                         Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectLighting<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectLighting<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedLineColorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                          Tcl_Obj *const *objv)
+{
+    float color[3];
+    if (GetFloatFromObj(interp, objv[2], &color[0]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[3], &color[1]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[4], &color[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectEdgeColor<Parallelepiped>(name, color);
+    } else {
+        g_renderer->setGraphicsObjectEdgeColor<Parallelepiped>("all", color);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedLineWidthOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                          Tcl_Obj *const *objv)
+{
+    float width;
+    if (GetFloatFromObj(interp, objv[2], &width) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectEdgeWidth<Parallelepiped>(name, width);
+    } else {
+        g_renderer->setGraphicsObjectEdgeWidth<Parallelepiped>("all", width);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedMaterialOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                         Tcl_Obj *const *objv)
+{
+    double ambient, diffuse, specCoeff, specPower;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &ambient) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &diffuse) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &specCoeff) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &specPower) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    if (objc == 7) {
+        const char *name = Tcl_GetString(objv[6]);
+        g_renderer->setGraphicsObjectAmbient<Parallelepiped>(name, ambient);
+        g_renderer->setGraphicsObjectDiffuse<Parallelepiped>(name, diffuse);
+        g_renderer->setGraphicsObjectSpecular<Parallelepiped>(name, specCoeff, specPower);
+    } else {
+        g_renderer->setGraphicsObjectAmbient<Parallelepiped>("all", ambient);
+        g_renderer->setGraphicsObjectDiffuse<Parallelepiped>("all", diffuse);
+        g_renderer->setGraphicsObjectSpecular<Parallelepiped>("all", specCoeff, specPower);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedOpacityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
+{
+    double opacity;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &opacity) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectOpacity<Parallelepiped>(name, opacity);
+    } else {
+        g_renderer->setGraphicsObjectOpacity<Parallelepiped>("all", opacity);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedOrientOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    double quat[4];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &quat[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &quat[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &quat[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &quat[3]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 7) {
+        const char *name = Tcl_GetString(objv[6]);
+        g_renderer->setGraphicsObjectOrientation<Parallelepiped>(name, quat);
+    } else {
+        g_renderer->setGraphicsObjectOrientation<Parallelepiped>("all", quat);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedOriginOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    double origin[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &origin[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &origin[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &origin[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectOrigin<Parallelepiped>(name, origin);
+    } else {
+        g_renderer->setGraphicsObjectOrigin<Parallelepiped>("all", origin);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedPositionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                         Tcl_Obj *const *objv)
+{
+    double pos[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &pos[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &pos[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &pos[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectPosition<Parallelepiped>(name, pos);
+    } else {
+        g_renderer->setGraphicsObjectPosition<Parallelepiped>("all", pos);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    double scale[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &scale[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &scale[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &scale[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectScale<Parallelepiped>(name, scale);
+    } else {
+        g_renderer->setGraphicsObjectScale<Parallelepiped>("all", scale);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedShadingOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
+{
+    GraphicsObject::ShadingModel shadeModel;
+    const char *str = Tcl_GetString(objv[2]);
+    if (str[0] == 'f' && strcmp(str, "flat") == 0) {
+        shadeModel = GraphicsObject::SHADE_FLAT;
+    } else if (str[0] == 's' && strcmp(str, "smooth") == 0) {
+        shadeModel = GraphicsObject::SHADE_GOURAUD;
+    } else {
+         Tcl_AppendResult(interp, "bad shading option \"", str,
+                         "\": should be one of: 'flat', 'smooth'", (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectShadingModel<Parallelepiped>(name, shadeModel);
+    } else {
+        g_renderer->setGraphicsObjectShadingModel<Parallelepiped>("all", shadeModel);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectVisibility<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectVisibility<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedWireframeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                          Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectWireframe<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectWireframe<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec parallelepipedOps[] = {
+    {"add",       1, ParallelepipedAddOp, 12, 12, "v0x v0y v0z v1x v1y v1z v2x v2y v2z name"},
+    {"color",     2, ParallelepipedColorOp, 5, 6, "r g b ?name?"},
+    {"culling",   2, ParallelepipedCullingOp, 3, 4, "bool ?name?"},
+    {"delete",    1, ParallelepipedDeleteOp, 2, 3, "?name?"},
+    {"edges",     1, ParallelepipedEdgeVisibilityOp, 3, 4, "bool ?name?"},
+    {"flipnorms", 1, ParallelepipedFlipNormalsOp, 3, 4, "bool ?name?"},
+    {"lighting",  3, ParallelepipedLightingOp, 3, 4, "bool ?name?"},
+    {"linecolor", 5, ParallelepipedLineColorOp, 5, 6, "r g b ?name?"},
+    {"linewidth", 5, ParallelepipedLineWidthOp, 3, 4, "width ?name?"},
+    {"material",  1, ParallelepipedMaterialOp, 6, 7, "ambientCoeff diffuseCoeff specularCoeff specularPower ?name?"},
+    {"opacity",   2, ParallelepipedOpacityOp, 3, 4, "value ?name?"},
+    {"orient",    4, ParallelepipedOrientOp, 6, 7, "qw qx qy qz ?name?"},
+    {"origin",    4, ParallelepipedOriginOp, 5, 6, "x y z ?name?"},
+    {"pos",       1, ParallelepipedPositionOp, 5, 6, "x y z ?name?"},
+    {"scale",     2, ParallelepipedScaleOp, 5, 6, "sx sy sz ?name?"},
+    {"shading",   2, ParallelepipedShadingOp, 3, 4, "val ?name?"},
+    {"visible",   1, ParallelepipedVisibleOp, 3, 4, "bool ?name?"},
+    {"wireframe", 1, ParallelepipedWireframeOp, 3, 4, "bool ?name?"}
+};
+static int nParallelepipedOps = NumCmdSpecs(parallelepipedOps);
+
+static int
+ParallelepipedCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+       Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nParallelepipedOps, parallelepipedOps,
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
 PolyDataAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -12228 +12601 @@
 {
     Tcl_MakeSafe(interp);
-    Tcl_CreateObjCommand(interp, "arc",         ArcCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "arrow",       ArrowCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "box",         BoxCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "clientinfo",  ClientInfoCmd,  clientData, NULL);
-    Tcl_CreateObjCommand(interp, "colormap",    ColorMapCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "cone",        ConeCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "contour2d",   Contour2DCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "contour3d",   Contour3DCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "cutplane",    CutplaneCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "cylinder",    CylinderCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "dataset",     DataSetCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "disk",        DiskCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "glyphs",      GlyphsCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "group",       GroupCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "image",       ImageCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  clientData, NULL);
-    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "legend2",     LegendSimpleCmd,clientData, NULL);
-    Tcl_CreateObjCommand(interp, "lic",         LICCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "line",        LineCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "molecule",    MoleculeCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "outline",     OutlineCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "polydata",    PolyDataCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "polygon",     PolygonCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "pseudocolor", PseudoColorCmd, clientData, NULL);
-    Tcl_CreateObjCommand(interp, "renderer",    RendererCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "sphere",      SphereCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "streamlines", StreamlinesCmd, clientData, NULL);
-    Tcl_CreateObjCommand(interp, "text3d",      Text3DCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "warp",        WarpCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "arc",            ArcCmd,            clientData, NULL);
+    Tcl_CreateObjCommand(interp, "arrow",          ArrowCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "axis",           AxisCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "box",            BoxCmd,            clientData, NULL);
+    Tcl_CreateObjCommand(interp, "camera",         CameraCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "clientinfo",     ClientInfoCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "colormap",       ColorMapCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cone",           ConeCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour2d",      Contour2DCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour3d",      Contour3DCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cutplane",       CutplaneCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cylinder",       CylinderCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "dataset",        DataSetCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "disk",           DiskCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "glyphs",         GlyphsCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "group",          GroupCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "heightmap",      HeightMapCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "image",          ImageCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",       ImageFlushCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend",         LegendCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend2",        LegendSimpleCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "lic",            LICCmd,            clientData, NULL);
+    Tcl_CreateObjCommand(interp, "line",           LineCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "molecule",       MoleculeCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "outline",        OutlineCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "parallelepiped", ParallelepipedCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "polydata",       PolyDataCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "polygon",        PolygonCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "pseudocolor",    PseudoColorCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "renderer",       RendererCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "screen",         ScreenCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "sphere",         SphereCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "streamlines",    StreamlinesCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "text3d",         Text3DCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "volume",         VolumeCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "warp",           WarpCmd,           clientData, NULL);
 }
 
@@ -12295 +12669 @@
     Tcl_DeleteCommand(interp, "molecule");
     Tcl_DeleteCommand(interp, "outline");
+    Tcl_DeleteCommand(interp, "parallelepiped");
     Tcl_DeleteCommand(interp, "polydata");
     Tcl_DeleteCommand(interp, "polygon");