Changeset 4239 for branches/1.3


Ignore:
Timestamp:
Mar 11, 2014 11:38:22 AM (6 years ago)
Author:
ldelgass
Message:

merge r4040 from trunk. Brings vtkvis up to date with installed version

Location:
branches/1.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4040
  • branches/1.3/packages/vizservers/vtkvis/Makefile.in

    r4238 r4239  
    22TRACE                   = #yes
    33USE_CUSTOM_AXES         = yes
    4 USE_FONT_CONFIG         = #yes
     4USE_FONT_CONFIG         = yes
    55USE_GPU_RAYCASTING      = yes
    66USE_OFFSCREEN_RENDERING = #yes
     
    125125DEFINES         += -DUSE_THREADS
    126126endif
     127ifdef NEW_SCALAR_BAR
     128DEFINES         += -DNEW_SCALAR_BAR
     129endif
     130
    127131VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)"
    128132DEFINES         += -DUSE_VTK6 $(VTK_MOD_DEFS)
    129 ifdef NEW_SCALAR_BAR
    130 DEFINES         += -DNEW_SCALAR_BAR
    131 endif
    132133
    133134CXX_SWITCHES    = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEFINES) $(INCLUDES)
  • branches/1.3/packages/vizservers/vtkvis/RenderServer.h

    r3877 r4239  
    1616class Renderer;
    1717
    18 #define VTKVIS_VERSION_STRING "1.6"
     18#define VTKVIS_VERSION_STRING "1.7"
    1919
    2020#define MSECS_ELAPSED(t1, t2) \
  • branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp

    r4234 r4239  
    1019410194    }
    1019510195    g_renderer->setUseDepthPeeling(state);
     10196    if (objc > 3) {
     10197        if (objc < 5) {
     10198             Tcl_AppendResult(interp, "wrong # args: should be \"", Tcl_GetString(objv[0]),
     10199                              " ", Tcl_GetString(objv[1]), " bool ?occlusionRatio maxPeels?\"", (char*)NULL);
     10200            return TCL_ERROR;
     10201        }
     10202        double occlusionRatio;
     10203        int maxPeels;
     10204        if (Tcl_GetDoubleFromObj(interp, objv[3], &occlusionRatio) != TCL_OK) {
     10205            return TCL_ERROR;
     10206        }
     10207        if (occlusionRatio < 0.0 || occlusionRatio > 0.5) {
     10208            Tcl_AppendResult(interp, "bad occlusionRatio value \"", Tcl_GetString(objv[3]),
     10209                             "\": should be [0,0.5]", (char*)NULL);
     10210            return TCL_ERROR;
     10211        }
     10212        if (Tcl_GetIntFromObj(interp, objv[4], &maxPeels) != TCL_OK) {
     10213            return TCL_ERROR;
     10214        }
     10215        if (maxPeels < 0) {
     10216            Tcl_AppendResult(interp, "bad maxPeels value \"", Tcl_GetString(objv[3]),
     10217                             "\": must be zero or greater", (char*)NULL);
     10218            return TCL_ERROR;
     10219        }
     10220        g_renderer->setDepthPeelingParams(occlusionRatio, maxPeels);
     10221    }
    1019610222    return TCL_OK;
    1019710223}
     
    1023510261static Rappture::CmdSpec rendererOps[] = {
    1023610262    {"clipplane",  1, RendererClipPlaneOp, 5, 5, "axis ratio direction"},
    10237     {"depthpeel",  1, RendererDepthPeelingOp, 3, 3, "bool"},
     10263    {"depthpeel",  1, RendererDepthPeelingOp, 3, 5, "bool ?occlusionRatio maxPeels?"},
    1023810264    {"light2side", 6, RendererTwoSidedLightingOp, 3, 3, "bool"},
    1023910265    {"lights",     6, RendererLightsOp, 4, 4, "idx bool"},
  • branches/1.3/packages/vizservers/vtkvis/protocol.txt

    r4238 r4239  
    33Protocol for vtkvis render server. 
    44
    5 Commands take the general form of command and arguments using Tcl syntax and are 
     5Commands take the general form of command and arguments using Tcl syntax and are
    66terminated by a newline.  Some command arguments expect a Tcl list which can be
    77sent by enclosing the list in curly braces to prevent the interpreter from
     
    125125     <max> = maximum value of axis for labels
    126126axis scale <axis> <scale>
    127      Set axis range to be computed based on scaling the axis bounds by the
    128      given scale factor.
     127     Set axis range to be computed based on scaling the axis bounds by the given
     128     scale factor.
    129129     <axis> = x|y|z|all
    130130     <scale> = scale factor where range = bounds * scale
     
    247247         direction determines normal of clipping plane.  User clip planes do not
    248248         apply if camera mode is image.
    249 renderer depthpeel <bool>
     249renderer depthpeel <bool> <?occlusionRatio?> <?maxPeels?>
    250250         Set use of depth peeling algorithm for transparency
     251         <occlusionRatio> = [0,0.5] Value of 0 means exact rendering, higher
     252         values can speed rendering at the cost of some quality.  From VTK docs:
     253         "the threshold under which the algorithm stops to iterate over peel
     254         layers. This is the ratio of the number of pixels that have been
     255         touched by the last layer over the total number of pixels of the
     256         viewport area."
     257         <maxPeels> = 0 means unlimited passes, positive value limits the number
     258         of rendering passes
    251259renderer light2side <bool>
    252260         Toggle use of two-sided lighting (controls if backfaces are lit with a
Note: See TracChangeset for help on using the changeset viewer.