Changeset 2981 for GTP/trunk


Ignore:
Timestamp:
09/30/08 00:32:16 (16 years ago)
Author:
mattausch
Message:

debug version

Location:
GTP/trunk/App/Demos/Vis/FriendlyCulling/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

    r2980 r2981  
    164164        str.read(reinterpret_cast<char *>(&texId), sizeof(int)); 
    165165 
    166         if (texId >= 0) 
     166        if (0)//texId >= 0) 
    167167                mat->SetTexture(mTextureTable[texId]); 
    168168         
     
    182182                str.read(reinterpret_cast<char *>(&mat->mEmmisiveColor), sizeof(Vector3)); 
    183183                str.read(reinterpret_cast<char *>(&mat->mSpecularColor), sizeof(Vector3)); 
     184 
     185                mat->mAmbientColor = RandomColor(); 
     186                mat->mDiffuseColor = RgbaColor(0,0,0,1); 
    184187        } 
    185188 
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.h

    r2948 r2981  
    6060        ShapeContainer mShapes; 
    6161 
     62 
    6263        //////// 
    6364 
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp

    r2971 r2981  
    7676                cgGLLoadProgram(sCgMrtFragmentSkyDomeProgram); 
    7777 
    78                 /*sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth"); 
    79                 Material::sDiffuseParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "diffuse"); 
    80                 Material::sAmbientParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "ambient"); 
    81  
     78                /* 
    8279                cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist); 
    8380                */ 
     
    9188mSkyDome(skyDome), 
    9289mTurbidity(turbitity) 
    93 //      mSunQuad(NULL) 
     90//, mSunQuad(NULL) 
    9491{ 
    9592        CreateSunQuad(); 
     
    283280 
    284281        // downscale ambient color 
    285         //ambient *= 5e-5f; 
    286         ambient *= 1e-1f; 
     282        if (1) 
     283                ambient *= 5e-5f; 
     284        else 
     285                ambient *= 1e-1f; 
    287286 
    288287        // simulate the sun intensity by modulating the ambient term. 
     
    321320 
    322321        // Calculate final sun diffuse color. 
    323         diffuse = color * 3e-1f; 
     322        if (1) 
     323                diffuse = color * 1.7e-4f; 
     324        else 
     325                diffuse = color * 3e-1f; 
     326 
    324327        diffuse *= (2.0f - 1.0f * DotProd(sunDir, Vector3::UNIT_Z())); 
    325         //diffuse = color; 
    326328         
    327329 
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

    r2980 r2981  
    658658        // the diffuse color buffer 
    659659        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST); 
    660  
    661660        // the positions buffer 
    662661        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST); 
    663  
    664662        // the normals buffer 
    665663        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST); 
    666  
    667664        // another color buffer 
    668665        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST); 
     
    11381135                //traverser->RenderScene(); 
    11391136 
    1140         /* 
    1141                 state.Reset(); 
    1142                 aeroplane->Render(&state); 
    1143 */ 
    1144  
    11451137#if 0 
    11461138                SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end(); 
     
    11551147                        renderQueue->Enqueue(*sit); 
    11561148#endif 
     1149                         
    11571150                renderQueue->Apply(); 
    11581151        } 
Note: See TracChangeset for help on using the changeset viewer.