Changeset 88


Ignore:
Timestamp:
May 30, 2005, 11:58:21 PM (20 years ago)
Author:
darran
Message:
  • Commented out lighting marker pending removal (not a good paradigm)
  • Commented out "picture in picture" hack
  • compiles against OSG 0.9.9 on OSX, can't get focus on window and doesn't accept keyboard input
Location:
Swollen
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed

  • Swollen/swollen/Makefile

    r72 r88  
    77
    88OPTIMIZATION     =  -O2
     9#OPTIMIZATION     =  -g
    910
    1011OSG_INCLUDE      =  ${OSGHOME}/include

  • Swollen/swollen/customviewer.cpp

    r74 r88  
    11
    22#include <osg/LightSource>
     3#include <osg/AlphaFunc>
    34#include <osgUtil/UpdateVisitor>
    45#include <osgGA/StateSetManipulator>

  • Swollen/swollen/directionallight.cpp

    r73 r88  
    22#include <math.h>
    33#include <directionallight.h>
    4 #include <osg/ShapeDrawable>
    54#include <osg/Texture2D>
    6 #include <osgDB/ReadFile>
     5// #include <osg/ShapeDrawable>
     6// #include <osgDB/ReadFile>
    77
    88#include <iostream>
    99
    10 #define DEF_DEFAULT_CYLINDER_RADIUS 0.25
    11 #define DEF_DEFAULT_CYLINDER_HEIGHT 0.50
     10// #define DEF_DEFAULT_CYLINDER_RADIUS 0.25
     11// #define DEF_DEFAULT_CYLINDER_HEIGHT 0.50
    1212
    1313
    … …  
    3838    _transform->addChild( _source );
    3939
    40 
    4140    // marker geometry, texture and state
    42     _marker = osgDB::readNodeFile( "light.osg" );
    43     _transform->addChild( _marker );
    44 
     41    //_marker = osgDB::readNodeFile( "light.osg" );
     42    //_transform->addChild( _marker );
    4543
    4644    setPosition( osg::Vec3(0,0,1) );  // default overhead

  • Swollen/swollen/directionallight.h

    r73 r88  
    1 
    21
    32/*
    … …  
    3938    void setDiffuse( osg::Vec3f v ){ _light->setDiffuse(osg::Vec4(v,1)); }
    4039    const osg::Matrix getMatrix(){ return _transform->getMatrix(); }
    41     void show(){ _marker->setNodeMask(1); }
    42     void hide(){ _marker->setNodeMask(0); }
     40    // void show(){ _marker->setNodeMask(1); }
     41    // void hide(){ _marker->setNodeMask(0); }
    4342
    4443
    … …  
    5150    osg::LightSource* _source;
    5251
    53     osg::Node* _marker;
    54     osg::Cylinder* _shape;
    55     osg::Geometry* _geom;
    56     osg::StateSet* _stateset;
     52    // osg::Node* _marker;
     53    // osg::Cylinder* _shape;
     54    // osg::Geometry* _geom;
     55    // osg::StateSet* _stateset;
     56
    5757    virtual ~DirectionalLight();
    5858

  • Swollen/swollen/main.cpp

    r82 r88  
    188188
    189189    // second camera
    190     Producer::ref_ptr<Producer::Camera> pcam1 = viewer.getCamera(0);
    191     pcam1->setProjectionRectangle( 0.0f, 0.5f, 0.0f, 1.0f );
    192 
    193     Producer::Camera* pcam2 = new Producer::Camera();
    194     pcam2->setRenderSurface( pcam1->getRenderSurface() );
    195     pcam2->setProjectionRectangle( 0.76f, 1.0f, 0.0f, 0.25f );
    196     viewer.getCameraConfig()->addCamera( "pictureInPicture", pcam2 );
    197 
    198     osgProducer::OsgSceneHandler* sh = new osgProducer::OsgSceneHandler();
    199     sh->getSceneView()->setSceneData( rootnode );
    200     pcam2->setSceneHandler( sh );
     190//     Producer::ref_ptr<Producer::Camera> pcam1 = viewer.getCamera(0);
     191//     //pcam1->setProjectionRectangle( 0.0f, 0.5f, 0.0f, 1.0f );
     192
     193//     Producer::Camera* pcam2 = new Producer::Camera();
     194//     pcam2->setRenderSurface( pcam1->getRenderSurface() );
     195//     pcam2->setProjectionRectangle( 0.75f, 1.0f, 0.75f, 1.0f );
     196//     viewer.getCameraConfig()->addCamera( "pictureInPicture", pcam2 );
     197
     198//     osgProducer::OsgSceneHandler* sh = new osgProducer::OsgSceneHandler();
     199//     sh->getSceneView()->setSceneData( rootnode );
     200//     pcam2->setSceneHandler( sh );
    201201
    202202   
    … …  
    238238        // fire off the cull and draw traversals of the scene.
    239239        viewer.frame();
     240        //pcam1->frame(false);
     241        //pcam2->frame();
     242
    240243    }
    241244   

  • Swollen/swollen/version.cpp

    r82 r88  
    1 const char* version() { const char* s = "Revision: 76M"; return s; }
     1const char* version() { const char* s = "Revision: 87M"; return s; }

  • Swollen/swwreader/Makefile

    r64 r88  
    77
    88OPTIMIZATION     =  -O2
    9 #OPTIMIZATION     =  -g
     9OPTIMIZATION     =  -g
    1010
    1111NETCDF_INCLUDE   =  /sw/include
Note: See TracChangeset for help on using the changeset viewer.