Changeset 739

Show
Ignore:
Timestamp:
05/30/07 01:25:22 (2 years ago)
Author:
vossg
Message:

fixed : compile problems
added : cluster shader test, includes parameter animation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Tutorials/05geometry.cpp

    r637 r739  
    203203    // note that this is the abstract parent class, it doesn't have a specific 
    204204    // type 
    205     GeoPositionsPtr pos = geo->getPositions(); 
     205    GeoVectorPropertyPtr pos = geo->getPositions(); 
    206206     
    207207    for(UInt32 i = 0; i < pos->getSize(); i++) 
  • trunk/Tutorials/10loading.cpp

    r618 r739  
    3333// helper class to find a named node 
    3434// names are handled as simple attachments, get the header for that 
    35 #include <OpenSG/OSGSimpleAttachments.h> 
     35#include <OpenSG/OSGNameAttachment.h> 
    3636 
    3737// There are two convenience functions for name access: getName() and 
  • trunk/Tutorials/22Shader.cpp

    r637 r739  
    2121#include <OpenSG/OSGSimpleMaterial.h> 
    2222#include <OpenSG/OSGImage.h> 
    23 #include <OpenSG/OSGTextureChunk.h> 
     23#include <OpenSG/OSGTextureObjChunk.h> 
     24#include <OpenSG/OSGTextureEnvChunk.h> 
    2425#include <OpenSG/OSGGradientBackground.h> 
    2526#include <OpenSG/OSGSHLChunk.h> 
     
    152153    bottom_img->set(Image::OSG_RGB_PF, 2, 2, 1, 1, 1, 0, imgdata); 
    153154 
    154     TextureChunkPtr bottom_tex = TextureChunk::create(); 
     155    TextureObjChunkPtr bottom_tex     = TextureObjChunk::create(); 
     156    TextureEnvChunkPtr bottom_tex_env = TextureEnvChunk::create(); 
     157 
    155158    bottom_tex->setImage(bottom_img); 
    156159    bottom_tex->setMinFilter(GL_LINEAR); 
     
    158161    bottom_tex->setWrapS(GL_REPEAT); 
    159162    bottom_tex->setWrapT(GL_REPEAT); 
    160     bottom_tex->setEnvMode(GL_MODULATE); 
     163    bottom_tex_env->setEnvMode(GL_MODULATE); 
    161164 
    162165    SimpleMaterialPtr bottom_mat = SimpleMaterial::create(); 
     
    164167    bottom_mat->setDiffuse(Color3f(1.0,1.0,1.0)); 
    165168    bottom_mat->addChunk(bottom_tex); 
     169    bottom_mat->addChunk(bottom_tex_env); 
    166170     
    167171    GeometryPtr bottom_geo = cast_dynamic<GeometryPtr>(bottom->getCore());