Changeset 1031 for trunk


Ignore:
Timestamp:
Jun 9, 2008, 10:01:14 AM (16 years ago)
Author:
gah
Message:

more 1.1 fixes

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/vizservers/nanovis/Command.cpp

    r1029 r1031  
    4646#include "CmdProc.h"
    4747
    48 #include "RpField1D.h"
    49 #include "RpFieldRect3D.h"
    50 #include "RpFieldPrism3D.h"
    51 #include "RpEncode.h"
     48#include <RpField1D.h>
     49#include <RpFieldRect3D.h>
     50#include <RpFieldPrism3D.h>
     51#include <RpEncode.h>
     52#include <RpOutcome.h>
     53#include <RpBuffer.h>
    5254
    5355#include "transfer-function/TransferFunctionMain.h"
    … …  
    7274#include <RenderContext.h>
    7375#include <NvLIC.h>
    74 #include <RpOutcome.h>
    75 #include <RpBuffer.h>
    7676
    7777#define ISO_TEST                1

  • trunk/src/core/RpPtr.h

    r1018 r1031  
    1414
    1515#include <assert.h>
     16#include <stddef.h>
    1617
    1718namespace Rappture {

  • trunk/src/core2/Makefile.in

    r1018 r1031  
    8484                RpSerialBuffer.h \
    8585                RpSerializable.h \
    86                 RpSerializer.h \
    87                 rappture2.h
     86                RpSerializer.h
    8887
    8988all: $(lib) $(shared_lib)

  • trunk/src/core2/RpField1D.h

    r657 r1031  
    1515 * ======================================================================
    1616 */
    17 #ifndef RAPPTURE_FIELD1D_H
    18 #define RAPPTURE_FIELD1D_H
     17#ifndef RPFIELD1D_H
     18#define RPFIELD1D_H
    1919
    20 #include "rappture2.h"
    21 #include "RpMesh1D.h"
     20#include <RpPtr.h>
     21#include <RpMesh1D.h>
    2222
    2323namespace Rappture {
    … …  
    5656} // namespace Rappture
    5757
    58 #endif
     58#endif /*RPFIELD1D_H*/

  • trunk/src/core2/RpFieldPrism3D.h

    r657 r1031  
    1414 * ======================================================================
    1515 */
    16 #ifndef RAPPTURE_FIELDPRISM3D_H
    17 #define RAPPTURE_FIELDPRISM3D_H
     16#ifndef RPFIELDPRISM3D_H
     17#define RPFIELDPRISM3D_H
    1818
    1919#include <math.h>
    2020#include <vector>
    21 #include "rappture2.h"
    22 #include "RpMeshPrism3D.h"
     21#include <RpPtr.h>
     22#include <RpMeshPrism3D.h>
    2323
    2424namespace Rappture {

  • trunk/src/core2/RpFieldRect3D.h

    r657 r1031  
    1414 * ======================================================================
    1515 */
    16 #ifndef RAPPTURE_FIELDRECT3D_H
    17 #define RAPPTURE_FIELDRECT3D_H
     16#ifndef RPFIELDRECT3D_H
     17#define RPFIELDRECT3D_H
    1818
    1919#include <math.h>
    2020#include <vector>
    21 #include "rappture2.h"
    22 #include "RpMeshRect3D.h"
     21#include <RpPtr.h>
     22#include <RpMeshRect3D.h>
    2323
    2424namespace Rappture {

  • trunk/src/core2/RpFieldTri2D.h

    r657 r1031  
    1414 * ======================================================================
    1515 */
    16 #ifndef RAPPTURE_FIELDTRI2D_H
    17 #define RAPPTURE_FIELDTRI2D_H
     16#ifndef RPFIELDTRI2D_H
     17#define RPFIELDTRI2D_H
    1818
    1919#include <math.h>
    2020#include <vector>
    21 #include "rappture2.h"
    22 #include "RpMeshTri2D.h"
     21#include <RpPtr.h>
     22#include <RpMeshTri2D.h>
    2323
    2424namespace Rappture {

  • trunk/src/core2/RpMesh1D.h

    r657 r1031  
    1616 * ======================================================================
    1717 */
    18 #ifndef RAPPTURE_MESH1D_H
    19 #define RAPPTURE_MESH1D_H
     18#ifndef RPMESH1D_H
     19#define RPMESH1D_H
    2020
    2121#include <deque>
    22 #include "RpNode.h"
    23 #include "RpSerializable.h"
     22#include <RpNode.h>
     23#include <RpSerializable.h>
    2424
    2525namespace Rappture {
    … …  
    8484} // namespace Rappture
    8585
    86 #endif
     86#endif /*RPMESH1D_H*/

  • trunk/src/core2/RpMeshPrism3D.h

    r370 r1031  
    1313 * ======================================================================
    1414 */
    15 #ifndef RAPPTURE_MESHPRISM3D_H
    16 #define RAPPTURE_MESHPRISM3D_H
     15#ifndef RPMESHPRISM3D_H
     16#define RPMESHPRISM3D_H
    1717
    18 #include "RpMesh1D.h"
    19 #include "RpMeshTri2D.h"
     18#include <RpMesh1D.h>
     19#include <RpMeshTri2D.h>
    2020
    2121namespace Rappture {

  • trunk/src/core2/RpNode.h

    r665 r1031  
    1414 * ======================================================================
    1515 */
    16 #ifndef RAPPTURE_NODE_H
    17 #define RAPPTURE_NODE_H
    18 
    19 #include <assert.h>
     16#ifndef RPNODE_H
     17#define RPNODE_H
    2018
    2119namespace Rappture {
    2220
    23 enum Axis {xaxis=0, yaxis, zaxis};
     21enum Axis {
     22   xaxis, yaxis, zaxis
     23};
    2424
    2525class Node {
    … …  
    9696} // namespace Rappture
    9797
    98 #endif
     98#endif /*RPNODE_H*/

  • trunk/src/core2/RpSerialBuffer.h

    r413 r1031  
    1212 * ======================================================================
    1313 */
    14 #ifndef RAPPTURE_SERIALBUFFER_H
    15 #define RAPPTURE_SERIALBUFFER_H
     14#ifndef RPSERIALBUFFER_H
     15#define RPSERIALBUFFER_H
    1616
    1717#include <string>
    … …  
    6262} // namespace Rappture
    6363
    64 #endif
     64#endif /*RPSERIALBUFFER_H*/

  • trunk/src/core2/RpSerializable.h

    r657 r1031  
    1212 * ======================================================================
    1313 */
    14 #ifndef RAPPTURE_SERIALIZABLE_H
    15 #define RAPPTURE_SERIALIZABLE_H
     14#ifndef RPSERIALIZABLE_H
     15#define RPSERIALIZABLE_H
    1616
    1717#include <string>
    1818#include <map>
    19 #include "rappture2.h"
     19#include <RpOutcome.h>
     20#include <Ptr.h>
    2021#include "RpSerialBuffer.h"
    2122
    … …  
    7677} // namespace Rappture
    7778
    78 #endif
     79#endif /*RPSERIALIZABLE_H*/

  • trunk/src/core2/RpSerializer.h

    r657 r1031  
    1616 * ======================================================================
    1717 */
    18 #ifndef RAPPTURE_SERIALIZER_H
    19 #define RAPPTURE_SERIALIZER_H
     18#ifndef RPSERIALIZER_H
     19#define RPSERIALIZER_H
    2020
    2121#include <map>
    22 #include "rappture2.h"
     22#include <RpPtr.h>
     23#include <RpOutcome.h>
    2324#include "RpSerialBuffer.h"
    2425#include "RpSerializable.h"
Note: See TracChangeset for help on using the changeset viewer.