Changeset 316 for trunk/VUT/work/ogre_changes
- Timestamp:
- 10/10/05 15:23:32 (19 years ago)
- Location:
- trunk/VUT/work/ogre_changes
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/VUT/work/ogre_changes/OgreMain/include/OgreRenderSystem.h
r193 r316 947 947 virtual Real getMaximumDepthInputValue(void) = 0; 948 948 949 #ifdef GTP_VISIBILITY_MODIFIED_OGRE950 /** sets colour.951 */952 void setColour(int r, int g, int b, int a);953 #endif // GTP_VISIBILITY_MODIFIED_OGRE954 955 949 protected: 956 950 … … 990 984 991 985 bool mInvertVertexWinding; 992 993 #ifdef GTP_VISIBILITY_MODIFIED_OGRE994 int mColour[4];995 #endif // GTP_VISIBILITY_MODIFIED_OGRE996 986 }; 997 987 } -
trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneManager.h
r183 r316 136 136 */ 137 137 void _deleteRenderedQueueGroups(int leavePassesInQueue = 0); 138 /** Internal method used by _renderVisibleObjects to deal with renderables 138 /** Wrapper for useRenderableViewProjMde with is an 139 Internal method used by _renderVisibleObjects to deal with renderables 139 140 which override the camera's own view / projection materices. 140 @remark made public by matt 141 */ 142 void useRenderableViewProjMode(Renderable* pRend); 143 /** Method for setting up the renderstate for a rendering pass. 141 */ 142 void useRenderableViewProjModeWrapper(Renderable* pRend); // HACK 143 /** HACK: A public wrapper method for setting up the renderstate for a rendering pass. 144 144 @param 145 145 pass The Pass details to set. … … 149 149 @remark made public by matt 150 150 */ 151 virtual Pass* setPass (Pass* pass);151 virtual Pass* setPassWrapper(Pass* pass); 152 152 153 153 /** Renders an Ogre Entity. … … 273 273 /** Retrieves the internal render queue. */ 274 274 virtual RenderQueue* getRenderQueue(void); 275 #ifndef GTP_VISIBILITY_MODIFIED_OGRE // made public, is found in the modfified section 275 276 276 /** Internal method for setting up the renderstate for a rendering pass. 277 277 @param … … 282 282 */ 283 283 virtual Pass* setPass(Pass* pass); 284 #endif 284 285 285 /// A pass designed to let us render shadow colour on white for texture shadows 286 286 Pass* mShadowCasterPlainBlackPass; … … 357 357 AnimationList mAnimationsList; 358 358 AnimationStateSet mAnimationStates; 359 #ifndef GTP_VISIBILITY_MODIFIED_OGRE // made public, is found in the modfified section 359 360 360 /** Internal method used by _renderVisibleObjects to deal with renderables 361 361 which override the camera's own view / projection materices. */ 362 362 void useRenderableViewProjMode(Renderable* pRend); 363 #endif 363 364 364 /// Controller flag for determining if we need to set view/proj matrices 365 365 bool mCamChanged; -
trunk/VUT/work/ogre_changes/OgreMain/src/OgreRenderSystem.cpp
r150 r316 63 63 // instanciate RenderSystemCapabilities 64 64 mCapabilities = new RenderSystemCapabilities(); 65 66 #ifdef GTP_VISIBILITY_MODIFIED_OGRE67 mColour[0] = mColour[1] = mColour[2] = mColour[3] = 255;68 #endif // GTP_VISIBILITY_MODIFIED_OGRE69 65 } 70 66 … … 420 416 } 421 417 } 422 #ifdef GTP_VISIBILITY_MODIFIED_OGRE423 // ------------------------------------------------------------------424 void RenderSystem::setColour(int r, int g, int b, int a)425 {426 mColour[0] = r;427 mColour[1] = g;428 mColour[2] = b;429 mColour[3] = a;430 }431 #endif // GTP_VISIBILITY_MODIFIED_OGRE432 418 } 433 419 -
trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneManager.cpp
r193 r316 4200 4200 #ifdef GTP_VISIBILITY_MODIFIED_OGRE 4201 4201 //----------------------------------------------------------------------- 4202 Pass* SceneManager::setPassWrapper(Pass* pass) 4203 { 4204 return setPass(pass); 4205 } 4206 //----------------------------------------------------------------------- 4202 4207 void SceneManager::_renderSceneNode(Camera *cam, SceneNode *node, const int leavePassesInQueue) 4203 4208 { … … 4259 4264 renderSingleObject(rend, pass, false); 4260 4265 } 4266 //----------------------------------------------------------------------- 4267 void SceneManager::useRenderableViewProjModeWrapper(Renderable* pRend) 4268 { 4269 useRenderableViewProjMode(pRend); 4270 } 4261 4271 #endif //GTP_VISIBILITY_MODIFIED_OGRE 4262 4272 } -
trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h
r193 r316 208 208 int mDepth; 209 209 210 211 210 #endif // GTP_VISIBILITY_MODIFIED_OGRE 212 211 }; -
trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h
r193 r316 261 261 262 262 #ifdef GTP_VISIBILITY_MODIFIED_OGRE 263 /* the number of nodes in the octree. do not confuse this with the OctreeNode264 class with is derived from SceneNode.263 /** The number of nodes in the octree. 264 @remark counts the octree hierarchy nodes in the tree. 265 265 */ 266 int mNumOct reeNodes;266 int mNumOctants; 267 267 #endif // GTP_VISIBILITY_MODIFIED_OGRE 268 268 -
trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreTerrainRenderable.h
r193 r316 49 49 50 50 #ifdef GTP_VISIBILITY_MODIFIED_OGRE 51 #define MAX_RENDERLEVEL_INDEX 15 51 #define MAX_RENDERLEVEL_INDEX 15 // maximal different number of render levels, e.g., used for chc 52 52 #endif // GTP_VISIBILITY_MODIFIED_OGRE 53 53 -
trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp
r193 r316 108 108 else 109 109 mDepth = 0; 110 110 // update bounds because we want tight octree 111 111 _updateBounds(); 112 112 113 #endif //GTP_VISIBILITY_MODIFIED_OGRE 113 114 mNumNodes = 0; … … 133 134 134 135 mParent = 0; 136 135 137 } 136 138 -
trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp
r158 r316 318 318 319 319 #ifdef GTP_VISIBILITY_MODIFIED_OGRE 320 mNumOct reeNodes = 1; // count number of octants320 mNumOctants = 1; // initialise number of octants in tree 321 321 #endif // GTP_VISIBILITY_MODIFIED_OGRE 322 322 … … 470 470 octant -> mChildren[ x ][ y ][ z ] = new Octree( octant ); 471 471 #ifdef GTP_VISIBILITY_MODIFIED_OGRE 472 ++ mNumOctreeNodes;472 ++ mNumOctants; 473 473 #endif // GTP_VISIBILITY_MODIFIED_OGRE 474 474 -
trunk/VUT/work/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp
r193 r316 2328 2328 glDisableVertexAttribArrayARB_ptr(1); // disable weights 2329 2329 } 2330 #ifndef GTP_VISIBILITY_MODIFIED_OGRE2331 glColor4f(1,1,1,1);2332 #else2333 glColor4ub(mColour[0], mColour[1], mColour[2], mColour[3]);2334 #endif // GTP_VISIBILITY_MODIFIED_OGRE2335 2330 2336 2331 glSecondaryColor3fEXT_ptr(0.0f, 0.0f, 0.0f);
Note: See TracChangeset
for help on using the changeset viewer.