Changeset 5498 for nanovis


Ignore:
Timestamp:
May 11, 2015, 4:44:39 PM (4 years ago)
Author:
ldelgass
Message:

Officially merge r3605 -- picks up OrientationIndicator?, but is disabled for
now.

Location:
nanovis/branches/1.2
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2

  • nanovis/branches/1.2/Command.cpp

    r5486 r5498  
    6969#include "ZincBlendeVolume.h"
    7070#include "ZincBlendeReconstructor.h"
     71#include "OrientationIndicator.h"
    7172#include "Unirect.h"
    7273#include "Volume.h"
     
    21282129    }
    21292130    if (NanoVis::grid != NULL) {
    2130         Axis *axisPtr;
    2131 
    2132         axisPtr = NULL;     /* Suppress compiler warning. */
     2131        Axis *axisPtr = NULL;
    21332132        switch (axis) {
    21342133        case 0: axisPtr = &NanoVis::grid->xAxis; break;
     
    22132212            return TCL_ERROR;
    22142213        }
     2214#ifdef USE_ORIENTATION_INDICATOR
     2215        NanoVis::orientationIndicator->setVisible(visible);
     2216#else
    22152217        NanoVis::axisOn = visible;
     2218#endif
    22162219    } else {
    22172220        Tcl_AppendResult(interp, "bad axis option \"", string,
  • nanovis/branches/1.2/Makefile.in

    r5488 r5498  
    153153                HeightMap.o \
    154154                LIC.o \
     155                OrientationIndicator.o \
    155156                ParticleAdvectionShader.o \
    156157                ParticleRenderer.o \
     
    319320CmdProc.o: CmdProc.cpp CmdProc.h
    320321ColorTableShader.o: ColorTableShader.cpp ColorTableShader.h Shader.h
    321 Command.o: Command.cpp nanovis.h nanovisServer.h ReadBuffer.h ResponseQueue.h config.h define.h FlowCmd.h CmdProc.h Trace.h PlaneRenderer.h PPMWriter.h BMPWriter.h dxReader.h Grid.h HeightMap.h Camera.h ZincBlendeReconstructor.h Unirect.h Volume.h VolumeRenderer.h
     322Command.o: Command.cpp nanovis.h nanovisServer.h ReadBuffer.h ResponseQueue.h config.h define.h FlowCmd.h CmdProc.h Trace.h PlaneRenderer.h PPMWriter.h BMPWriter.h dxReader.h Grid.h HeightMap.h Camera.h ZincBlendeReconstructor.h OrientationIndicator.h Unirect.h Volume.h VolumeRenderer.h
    322323ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
    323324ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h Plane.h
     
    331332HeightMap.o: HeightMap.cpp HeightMap.h Shader.h
    332333LIC.o: LIC.cpp LIC.h FlowTypes.h Shader.h define.h
     334OrientationIndicator.o: OrientationIndicator.cpp OrientationIndicator.h
    333335ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h
    334336ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
     
    369371dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h ZincBlendeReconstructor.h
    370372md5.o: md5.h
    371 nanovis.o: nanovis.cpp nanovis.h nanovisServer.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h
     373nanovis.o: nanovis.cpp nanovis.h nanovisServer.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h
    372374nanovisServer.o: nanovisServer.cpp nanovisServer.h config.h nanovis.h define.h Command.h PPMWriter.h ReadBuffer.h Shader.h ResponseQueue.h Trace.h
  • nanovis/branches/1.2/nanovis.cpp

    r5489 r5498  
    4545#include "LIC.h"
    4646#include "Shader.h"
     47#include "OrientationIndicator.h"
    4748#include "PlaneRenderer.h"
    4849#include "PPMWriter.h"
     
    9596LIC *NanoVis::licRenderer = NULL;
    9697PlaneRenderer *NanoVis::planeRenderer = NULL;
     98OrientationIndicator *NanoVis::orientationIndicator = NULL;
    9799Grid *NanoVis::grid = NULL;
    98100
     
    592594
    593595    licRenderer = new LIC();
     596
     597#ifdef USE_ORIENTATION_INDICATOR
     598    orientationIndicator = new OrientationIndicator();
     599#endif
    594600
    595601    grid = new Grid();
     
    11461152
    11471153    // Now render things in the scene
    1148 
     1154#ifdef USE_ORIENTATION_INDICATOR
     1155    orientationIndicator->setPosition(sceneBounds.getCenter());
     1156    orientationIndicator->setScale(sceneBounds.getSize());
     1157    orientationIndicator->render();
     1158#else
    11491159    draw3dAxis();
     1160#endif
    11501161
    11511162    grid->render();
  • nanovis/branches/1.2/nanovis.h

    r5489 r5498  
    4747class HeightMap;
    4848class LIC;
     49class OrientationIndicator;
    4950class PlaneRenderer;
    5051class Texture2D;
     
    153154    static LIC *licRenderer;
    154155    static PlaneRenderer *planeRenderer;
     156    static OrientationIndicator *orientationIndicator;
    155157    static Grid *grid;
    156158
Note: See TracChangeset for help on using the changeset viewer.