Changeset 4877 for nanovis/branches


Ignore:
Timestamp:
Dec 18, 2014, 10:37:09 PM (5 years ago)
Author:
ldelgass
Message:

some cleanups

Location:
nanovis/branches/1.1
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/Unirect.cpp

    r4874 r4877  
    4747Rappture::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
    4848{
    49     Tcl_Obj *objPtr;
    50     objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
     49    Tcl_Obj *objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
    5150    Tcl_Obj **objv;
    5251    int objc;
     
    5453        return TCL_ERROR;
    5554    }
    56     int result;
    57     result = loadData(interp, objc, objv);
     55    int result = loadData(interp, objc, objv);
    5856    Tcl_DecrRefCount(objPtr);
    5957    if ((result != TCL_OK) || (!isInitialized())) {
     
    6664Rappture::Unirect3d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
    6765{
    68     Tcl_Obj *objPtr;
    69     objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
     66    Tcl_Obj *objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
    7067    Tcl_Obj **objv;
    7168    int objc;
     
    7370        return TCL_ERROR;
    7471    }
    75     int result;
    76     result = loadData(interp, objc, objv);
     72    int result = loadData(interp, objc, objv);
    7773    Tcl_DecrRefCount(objPtr);
    7874    if ((result != TCL_OK) || (!isInitialized())) {
  • nanovis/branches/1.1/Unirect.h

    r3502 r4877  
    99
    1010#include <float.h>
     11
     12#include <tcl.h>
    1113
    1214#include <rappture.h>
  • nanovis/branches/1.1/nanovis.cpp

    r4874 r4877  
    4646#include "define.h"
    4747
    48 #include "Command.h"
    4948#include "Flow.h"
    5049#include "Grid.h"
     
    5453#include "NvLIC.h"
    5554#include "PlaneRenderer.h"
    56 #include "Switch.h"
    5755#include "Trace.h"
    5856#include "TransferFunction.h"
     
    6866
    6967#define SIZEOF_BMP_HEADER   54
    70 
    71 #define CVT2SECS(x)  ((double)(x).tv_sec) + ((double)(x).tv_usec * 1.0e-6)
    72 
    73 #define TRUE    1
    74 #define FALSE   0
    7568
    7669// STATIC MEMBER DATA
     
    412405    screenBuffer = new unsigned char[4*winWidth*winHeight];
    413406    assert(screenBuffer != NULL);
    414    
     407
    415408    //delete the current render buffer resources
    416409    glDeleteTextures(1, &_finalColorTex);
  • nanovis/branches/1.1/protocol-nanovis.txt

    r4818 r4877  
    207207================================================================================
    208208nv>legend <volume> <min> <max> <nbytes>
    209   (followed by bytes and newline)
     209  (followed by bytes)
    210210
    211211nv>image -type image -bytes <nbytes>
    212   (followed by bytes -- command _preceded_ by newline)
     212  (followed by bytes)
    213213
    214214nv>image -type print -bytes <nbytes>
    215   (followed by bytes -- command _preceded_ by newline)
     215  (followed by bytes)
    216216
    217217nv>image -type movie -token <token> -bytes <nbytes>
Note: See TracChangeset for help on using the changeset viewer.