Changeset 4895 for nanovis/trunk


Ignore:
Timestamp:
Dec 21, 2014, 6:40:03 PM (5 years ago)
Author:
ldelgass
Message:

Merge some fixes from release branch

Location:
nanovis/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/Command.cpp

    r4894 r4895  
    3737#include <unistd.h>                     /* Needed for getpid, gethostname,
    3838                                         * write, etc. */
     39
     40#include <sstream>
     41
    3942#include <tcl.h>
    4043
  • nanovis/trunk/FlowCmd.cpp

    r4885 r4895  
    200200        }
    201201    } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
    202         unirect = new Unirect3d(nComponents);
    203         Unirect2d *u2dPtr;
    204         u2dPtr = new Unirect2d(nComponents);
     202        Unirect2d *u2dPtr = new Unirect2d(nComponents);
    205203        if (u2dPtr->parseBuffer(interp, bytes, length) != TCL_OK) {
    206             delete unirect;
    207204            delete u2dPtr;
    208205            return TCL_ERROR;
    209206        }
     207        unirect = new Unirect3d(nComponents);
    210208        unirect->convert(u2dPtr);
    211209        delete u2dPtr;
  • nanovis/trunk/ParticleAdvectionShader.h

    r3630 r4895  
    4343    }
    4444
    45     void setRenderMode(int mode)
    46     {
    47         _mode = mode;
    48     }
    49 
    5045private:
    5146    void init();
     
    5550    float _max;
    5651    float _timeStep;
    57     int _mode;
    5852};
    5953
  • nanovis/trunk/Shader.h

    r3875 r4895  
    291291    }
    292292
    293 
    294293    void resetPrograms();
    295294
  • nanovis/trunk/Unirect.cpp

    r4878 r4895  
    55 * Author: George A. Howlett <gah@purdue.edu>
    66 */
     7
     8#include <assert.h>
     9#include <string.h>
     10#include <math.h>
    711#include <float.h>
     12#include <ctype.h> // For isspace()
    813
    914#include <tcl.h>
  • nanovis/trunk/Unirect.h

    r4068 r4895  
    99
    1010#include <float.h>
     11#include <stdlib.h>
    1112
    1213#include <tcl.h>
  • nanovis/trunk/ZincBlendeVolume.cpp

    r3935 r4895  
    3939    zincblendeTex[0] = _tex;
    4040
    41     //now add another tex as zincblende_tex[1]
     41    //now add another tex as zincblendeTex[1]
    4242    Texture3D *secondTex = new Texture3D(width, height, depth, GL_FLOAT, GL_LINEAR, numComponents);
    4343    assert(secondTex);
Note: See TracChangeset for help on using the changeset viewer.