Changeset 13041 for OpenSceneGraph/trunk/include/osg/Uniform
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/include/osg/Uniform (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/include/osg/Uniform
r11959 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. 3 3 * Copyright (C) 2008 Zebra Imaging 4 4 * 5 * This application is open source and may be redistributed and/or modified 5 * This application is open source and may be redistributed and/or modified 6 6 * freely and without restriction, both in commercial and non commercial 7 7 * applications, as long as this copyright notice is maintained. 8 * 8 * 9 9 * This application is distributed in the hope that it will be useful, 10 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of … … 185 185 SAMPLER_1D_SHADOW = GL_SAMPLER_1D_SHADOW, 186 186 SAMPLER_2D_SHADOW = GL_SAMPLER_2D_SHADOW, 187 187 188 188 SAMPLER_1D_ARRAY = GL_SAMPLER_1D_ARRAY_EXT, 189 189 SAMPLER_2D_ARRAY = GL_SAMPLER_2D_ARRAY_EXT, … … 312 312 inline const ParentList& getParents() const { return _parents; } 313 313 314 /** Get the a copy of parent list of node. A copy is returned to 314 /** Get the a copy of parent list of node. A copy is returned to 315 315 * prevent modification of the parent list.*/ 316 316 inline ParentList getParents() { return _parents; } … … 483 483 484 484 protected: 485 485 486 486 virtual ~Uniform(); 487 487 Uniform& operator=(const Uniform&) { return *this; } … … 510 510 ref_ptr<Callback> _updateCallback; 511 511 ref_ptr<Callback> _eventCallback; 512 512 513 513 unsigned int _modifiedCount; 514 514 };
