| | 1 | 2009-01-29 15:07 robert |
| | 2 | |
| | 3 | * NEWS.txt: Updated news |
| | 4 | |
| | 5 | 2009-01-29 14:41 robert |
| | 6 | |
| | 7 | * src/osgViewer/ViewerBase.cpp: Fixed the sumation of the the |
| | 8 | unique number of primtivesets and vertices in the scene Stats |
| | 9 | collect |
| | 10 | |
| | 11 | 2009-01-29 14:35 robert |
| | 12 | |
| | 13 | * examples/osgcluster/CMakeLists.txt: Added CMakeLists.txt for |
| | 14 | osgcluster |
| | 15 | |
| | 16 | 2009-01-29 14:00 robert |
| | 17 | |
| | 18 | * NEWS.txt: First cut of NEWS for 2.8 release |
| | 19 | |
| | 20 | 2009-01-29 13:29 robert |
| | 21 | |
| | 22 | * CMakeLists.txt: Restructed the reporting of the libpath message |
| | 23 | so that it only appears the first time it's required |
| | 24 | |
| | 25 | 2009-01-29 13:17 robert |
| | 26 | |
| | 27 | * examples/CMakeLists.txt: Added osgcluster example into build |
| | 28 | system |
| | 29 | |
| | 30 | 2009-01-29 11:18 robert |
| | 31 | |
| | 32 | * src/osgPlugins/bsp/VBSPReader.cpp, |
| | 33 | src/osgPlugins/vtf/ReaderWriterVTF.cpp: From Jason Daly, |
| | 34 | "Somehow, one of the shaders in the bsp plugin started behaving |
| | 35 | incorrectly between the original submission and now. I suspect it |
| | 36 | has to do with a typo in the setup of the shader that was fixed |
| | 37 | at some point, or it happened during the recent warnings purge. |
| | 38 | In any case, I had to invert the usage of a parameter in the |
| | 39 | shader to make it behave properly again. |
| | 40 | |
| | 41 | |
| | 42 | The vtf plugin wasn't working in Windows due to OS differences in |
| | 43 | the byte-packing of the header structure (on Windows, the big |
| | 44 | block read was causing a buffer overrun). I fixed this by reading |
| | 45 | the structure from the file field by field. It's now happy on |
| | 46 | both Linux and Windows." |
| | 47 | |
| | 48 | 2009-01-29 11:03 robert |
| | 49 | |
| | 50 | * src/osgPlugins/Inventor/ConvertFromInventor.cpp: Fixed warning |
| | 51 | |
| | 52 | 2009-01-29 10:43 robert |
| | 53 | |
| | 54 | * CMakeLists.txt: Revised the message about install path. |
| | 55 | |
| | 56 | 2009-01-29 10:22 robert |
| | 57 | |
| | 58 | * src/osgAnimation/CMakeLists.txt: Added missing entry in build for |
| | 59 | AnimationManager.cpp |
| | 60 | |
| | 61 | 2009-01-29 09:28 robert |
| | 62 | |
| | 63 | * src/osgUtil/SceneView.cpp: Improved the handling of toggling of |
| | 64 | GL_LIGHTi modes when SceneView::setLightingMode() is toggled |
| | 65 | on/off. |
| | 66 | |
| | 67 | 2009-01-29 09:27 robert |
| | 68 | |
| | 69 | * src/osgPlugins/OpenFlight/expPrimaryRecords.cpp: Replaced -1 with |
| | 70 | ~0u to fix warning due to being written to a UInt field. Note, |
| | 71 | OpenFlight spec says -1, which is clearly an error in the spec, |
| | 72 | so we've had to guess at ~0u being an appropriate value. |
| | 73 | |
| | 74 | 2009-01-29 09:24 robert |
| | 75 | |
| | 76 | * examples/osgvolume/osgvolume.cpp: Removed now redundent shader |
| | 77 | files. |
| | 78 | |
| | 79 | Fixed the adding of transfer function property. |
| | 80 | |
| | 81 | 2009-01-28 16:48 robert |
| | 82 | |
| | 83 | * examples/osgvolume/volume_frag.cpp, |
| | 84 | examples/osgvolume/volume_iso_frag.cpp, |
| | 85 | examples/osgvolume/volume_mip_frag.cpp, |
| | 86 | examples/osgvolume/volume_n_frag.cpp, |
| | 87 | examples/osgvolume/volume_tf_frag.cpp, |
| | 88 | examples/osgvolume/volume_tf_iso_frag.cpp, |
| | 89 | examples/osgvolume/volume_tf_mip_frag.cpp, |
| | 90 | examples/osgvolume/volume_tf_n_frag.cpp, |
| | 91 | examples/osgvolume/volume_vert.cpp: Removed old shader files |
| | 92 | |
| | 93 | 2009-01-28 16:44 robert |
| | 94 | |
| | 95 | * src/osgWidget/Window.cpp, src/osgWidget/WindowManager.cpp: |
| | 96 | Removed comments. |
| | 97 | |
| | 98 | 2009-01-28 15:23 robert |
| | 99 | |
| | 100 | * src/osgWrappers/osg/CullStack.cpp: Updated wrappers |
| | 101 | |
| | 102 | 2009-01-28 15:15 robert |
| | 103 | |
| | 104 | * include/osg/CullStack: Moved push/popCulling set it public scope. |
| | 105 | |
| | 106 | 2009-01-28 13:45 robert |
| | 107 | |
| | 108 | * src/osgViewer/StatsHandler.cpp: From Paul Melis, "1) Changes the |
| | 109 | order of the camera stats slightly, to be more in line with |
| | 110 | the view stats |
| | 111 | 2) Uses a slightly smaller block for view statistics" |
| | 112 | |
| | 113 | 2009-01-28 12:55 robert |
| | 114 | |
| | 115 | * CMakeLists.txt: From Mathias Froehlich, fixed typo. |
| | 116 | |
| | 117 | 2009-01-28 12:51 robert |
| | 118 | |
| | 119 | * src/osgPlugins/OpenFlight/PrimaryRecords.cpp, |
| | 120 | src/osgPlugins/osgSim/IO_ObjectRecordData.cpp: Fixed warnings |
| | 121 | |
| | 122 | 2009-01-28 12:45 robert |
| | 123 | |
| | 124 | * src/osgWidget/Window.cpp, src/osgWidget/WindowManager.cpp: Fixed |
| | 125 | of warnings |
| | 126 | |
| | 127 | 2009-01-28 12:28 robert |
| | 128 | |
| | 129 | * src/osgPlugins/3ds/readwrite.cpp, src/osgPlugins/bsp/BITSET.cpp: |
| | 130 | Fixed warnings |
| | 131 | |
| | 132 | 2009-01-28 12:02 robert |
| | 133 | |
| | 134 | * CMakeLists.txt: Temporarily disabled VS warning C4100 to enable |
| | 135 | use to home in on the useful warnings that could do with |
| | 136 | resolving. |
| | 137 | |
| | 138 | 2009-01-28 11:59 robert |
| | 139 | |
| | 140 | * src/osgAnimation/Animation.cpp, src/osgWidget/Input.cpp: From |
| | 141 | Mathias Froehlich, "I have today built svn trunk on HP-UX and |
| | 142 | Solaris8. |
| | 143 | I had to do two small changes to src/osgWidget/Input.cpp and |
| | 144 | src/osgAnimation/Animation.cpp mainly because of name lookup |
| | 145 | problems. |
| | 146 | " |
| | 147 | |
| | 148 | 2009-01-28 11:16 robert |
| | 149 | |
| | 150 | * src/osgParticle/FluidFrictionOperator.cpp: From Lionel Lagarde, |
| | 151 | removed accounting of local to world transform on the force |
| | 152 | vector as the particle velocity should already been in world |
| | 153 | coords. Fixing this addresses a bug where particles accelerated |
| | 154 | out of the scene rather than slowing down. |
| | 155 | |
| | 156 | 2009-01-28 10:06 robert |
| | 157 | |
| | 158 | * src/osgViewer/View.cpp, src/osgViewer/ViewerBase.cpp: Added check |
| | 159 | against existing of a valid Stats object in |
| | 160 | ViewerBase::renderinTraverls() to prevent crash. |
| | 161 | |
| | 162 | Added default View Stats into src/osgViewer/View.cpp to enable |
| | 163 | stats to be collected for views |
| | 164 | |
| | 165 | 2009-01-28 09:42 robert |
| | 166 | |
| | 167 | * CMakeLists.txt, packaging/ld.so.conf.d, |
| | 168 | packaging/ld.so.conf.d/openscenegraph.conf.in: From Mattias |
| | 169 | Helsing, "this is a semi-submission based on what you and others |
| | 170 | have been |
| | 171 | talking about in the LIB_POSTFIX thread. It is a bit verbose |
| | 172 | perhaps |
| | 173 | and the message I emit during the make install step flashes by |
| | 174 | and |
| | 175 | gets burried under all "installing..." and/or "up-to-date..." |
| | 176 | messages. I have posted on the cmake mail list on ways to do this |
| | 177 | better. |
| | 178 | |
| | 179 | The submission adds: |
| | 180 | * message to user during configuration that s/he's eventually |
| | 181 | going o |
| | 182 | install to ${CMAKE_INSTALL_PREFIX}lib${LIB_POSTFIX} |
| | 183 | * if system has /etc/ld.so.conf.d and it is a dir generates |
| | 184 | packaging/ld.so.conf.d/openscenegraph.conf and creates a custom |
| | 185 | target |
| | 186 | for installing it (target must be run explicitly of course). User |
| | 187 | is |
| | 188 | notified of this during configuration (may not be necessary) |
| | 189 | * emit a message during installation that libraries are put in |
| | 190 | <same-as-above>. This message unfortunately gets emitted to soon |
| | 191 | for |
| | 192 | the user to see it |
| | 193 | |
| | 194 | * I added "COMPONENT libopenscenegraph-dev" to the pkgconfig.pc's |
| | 195 | install command |
| | 196 | * Moved the section with OSG_CONFIG_HAS_BEEN_RUN_BEFORE as close |
| | 197 | to |
| | 198 | the end of CMakeLists.txt as I dared. This is the intent of this |
| | 199 | construct I think." |
| | 200 | |
| | 201 | 2009-01-28 09:31 robert |
| | 202 | |
| | 203 | * examples/osgcompositeviewer/osgcompositeviewer.cpp, |
| | 204 | src/osgViewer/StatsHandler.cpp: From Paul Melis, "Here is an |
| | 205 | updated osgViewer::StatsHandler. It has the following changes: |
| | 206 | - The text and dark background rectangles are now correctly |
| | 207 | placed, and |
| | 208 | slightly resized here and there. |
| | 209 | - All counters (vertices, etc) now use a fixed formatting with 0 |
| | 210 | digits |
| | 211 | precision, to prevent the text from being shown in scientific |
| | 212 | notation |
| | 213 | when the number get large (e.g. 6.34344e+6). I tested with a |
| | 214 | scene |
| | 215 | containing roughly 4 million vertices, to make sure its stats |
| | 216 | would |
| | 217 | display correctly. |
| | 218 | |
| | 219 | I also made slight changes to osgcompositeviewer (attached) to |
| | 220 | aid in |
| | 221 | testing the stats display, specifically displaying of camera and |
| | 222 | view |
| | 223 | names." |
| | 224 | |
| | 225 | 2009-01-28 09:26 robert |
| | 226 | |
| | 227 | * examples/osgcompositeviewer/osgcompositeviewer.cpp: From Paul |
| | 228 | Melis, remove redundent spaces |
| | 229 | |
| | 230 | 2009-01-28 09:24 robert |
| | 231 | |
| | 232 | * src/osgViewer/StatsHandler.cpp: From Paul Melis, removed |
| | 233 | redundent spacing. |
| | 234 | |
| | 235 | 2009-01-28 09:23 robert |
| | 236 | |
| | 237 | * include/osgUtil/SceneView, src/osgUtil/SceneView.cpp: Fixed the |
| | 238 | handling of setLightingMode and inheritCullSettings so that it |
| | 239 | properly manages the GL_LIGHTING mode |
| | 240 | |
| | 241 | 2009-01-28 09:21 robert |
| | 242 | |
| | 243 | * include/osg/Shape, src/osg/Shape.cpp: From Patrick Hartling, "I |
| | 244 | encountered a bug related to RTTI for subclasses of osg::Shape. |
| | 245 | The |
| | 246 | circumstances under which this bug occur are rather specific, but |
| | 247 | the |
| | 248 | basic problem occurs when one translation unit other than |
| | 249 | libosg.so |
| | 250 | constructs an object that is a subclass of osg::Shape and another |
| | 251 | translation unit other than libosg.so tries to perform a |
| | 252 | dynamic_cast or |
| | 253 | other RTTI-based operation on that object. Under these |
| | 254 | circumstances, |
| | 255 | the RTTI operation will fail. In my case, the translation units |
| | 256 | involved |
| | 257 | were an application and osgdb_ive.so. The application constructed |
| | 258 | a |
| | 259 | scene graph that included instantiations of subclasses of |
| | 260 | osg::Shape. |
| | 261 | Depending on how the user ran the application, it would write the |
| | 262 | scene |
| | 263 | graph to an IVE file using osgDB::writeNodeFile(). The |
| | 264 | dynamic_cast |
| | 265 | operations in DataOutputStream::writeShape() would fail on the |
| | 266 | first |
| | 267 | subclass of osg::Shape that was encountered. This is because |
| | 268 | there were |
| | 269 | two different RTTI data objects for all osg::Shape subclasses |
| | 270 | being |
| | 271 | compared: one in the application and one in osgdb_ive.so. |
| | 272 | |
| | 273 | The fix for this is simple. We must ensure that at least one |
| | 274 | member |
| | 275 | function of each of the subclasses of the polymorphic type |
| | 276 | osg::Shape is |
| | 277 | compiled into libosg.so so that there is exactly one RTTI object |
| | 278 | for |
| | 279 | that type in libosg.so. Then, all code linking against libosg.so |
| | 280 | will |
| | 281 | use that single RTTI object. The following message from a list |
| | 282 | archive |
| | 283 | sort of explains the issue and the solution: |
| | 284 | |
| | 285 | http://aspn.activestate.com/ASPN/Mail/Message/1688156 |
| | 286 | |
| | 287 | While the posting has to do with Boost.Python, the problem |
| | 288 | applies to |
| | 289 | C++ libraries in general." |
| | 290 | |
| | 291 | 2009-01-28 09:06 robert |
| | 292 | |
| | 293 | * src/osgPlugins/cfg/RenderSurface.cpp: Added back in intializers |
| | 294 | for RenderSurface. |
| | 295 | |
| | 296 | 2009-01-27 15:35 robert |
| | 297 | |
| | 298 | * packaging/pkgconfig/openscenegraph.pc, |
| | 299 | packaging/pkgconfig/openthreads.pc: Removed .pc files as they are |
| | 300 | now automatically generated with the correct values by Cmake from |
| | 301 | the openthreads.pc.in and openscenegraph.pc.in files. |
| | 302 | |
| | 303 | 2009-01-27 15:34 robert |
| | 304 | |
| | 305 | * CMakeLists.txt, src/OpenThreads/CMakeLists.txt: From Alberto |
| | 306 | Luaces, "I have modified CMakeLists.txt in order to make CMake |
| | 307 | fill the existent |
| | 308 | openscenegraph.pc and openthreads.pc files with OSG's |
| | 309 | installation values. |
| | 310 | Then I install those files into the expected path for pkg-config |
| | 311 | (this can |
| | 312 | also be modified through PKG_CONFIG_PATH environment variable). |
| | 313 | Therefore |
| | 314 | those of us who are using pkg-config for linking can easily |
| | 315 | select which |
| | 316 | version of OSG we want to use." |
| | 317 | |
| | 318 | 2009-01-27 15:34 robert |
| | 319 | |
| | 320 | * packaging/pkgconfig/openscenegraph.pc, |
| | 321 | packaging/pkgconfig/openscenegraph.pc.in, |
| | 322 | packaging/pkgconfig/openthreads.pc, |
| | 323 | packaging/pkgconfig/openthreads.pc.in: From Alberto Luaces, "I |
| | 324 | have modified CMakeLists.txt in order to make CMake fill the |
| | 325 | existent |
| | 326 | openscenegraph.pc and openthreads.pc files with OSG's |
| | 327 | installation values. |
| | 328 | Then I install those files into the expected path for pkg-config |
| | 329 | (this can |
| | 330 | also be modified through PKG_CONFIG_PATH environment variable). |
| | 331 | Therefore |
| | 332 | those of us who are using pkg-config for linking can easily |
| | 333 | select which |
| | 334 | version of OSG we want to use." |
| | 335 | |
| | 336 | 2009-01-27 15:14 robert |
| | 337 | |
| | 338 | * src/osgPlugins/tiff/ReaderWriterTIFF.cpp: From Jason Beverage, |
| | 339 | "Here is a small fix that enables writing 16 bit short images in |
| | 340 | the tiff plugin. |
| | 341 | " |
| | 342 | |
| | 343 | 2009-01-27 14:11 robert |
| | 344 | |
| | 345 | * include/osgShadow/DebugShadowMap, |
| | 346 | include/osgShadow/MinimalDrawBoundsShadowMap, |
| | 347 | src/osgShadow/DebugShadowMap.cpp: Converted viewer camera |
| | 348 | references to use observer_ptr<> rather than ref_ptr<> or C |
| | 349 | pointers to avoid issues with circular references/dangling |
| | 350 | pointers. |
| | 351 | |
| | 352 | 2009-01-27 13:23 robert |
| | 353 | |
| | 354 | * include/osg/View, include/osgViewer/CompositeViewer, |
| | 355 | include/osgViewer/Viewer, include/osgViewer/ViewerBase, |
| | 356 | src/osgViewer/CompositeViewer.cpp, |
| | 357 | src/osgViewer/StatsHandler.cpp, src/osgViewer/Viewer.cpp, |
| | 358 | src/osgViewer/ViewerBase.cpp, src/osgWrappers/osg/View.cpp, |
| | 359 | src/osgWrappers/osgUtil/Statistics.cpp, |
| | 360 | src/osgWrappers/osgViewer/CompositeViewer.cpp, |
| | 361 | src/osgWrappers/osgViewer/Viewer.cpp, |
| | 362 | src/osgWrappers/osgViewer/ViewerBase.cpp: Refactored the view |
| | 363 | stats. |
| | 364 | |
| | 365 | 2009-01-27 09:09 robert |
| | 366 | |
| | 367 | * src/osg/State.cpp: Commented out debug message |
| | 368 | |
| | 369 | 2009-01-26 21:23 robert |
| | 370 | |
| | 371 | * include/osgUtil/Statistics, src/osgViewer/Renderer.cpp, |
| | 372 | src/osgViewer/StatsHandler.cpp: Ported onscreen camera stats |
| | 373 | across to using thread safe stats collection |
| | 374 | |
| | 375 | 2009-01-26 19:22 robert |
| | 376 | |
| | 377 | * configure: Added passing of command line args to cmake |
| | 378 | |
| | 379 | 2009-01-26 16:55 robert |
| | 380 | |
| | 381 | * src/osgPlugins/logo/ReaderWriterLOGO.cpp: Converted across to |
| | 382 | using ref_ptr<> to avoid memory leak/dangling pointer issues. |
| | 383 | |
| | 384 | 2009-01-26 15:16 robert |
| | 385 | |
| | 386 | * include/osg/Referenced, include/osg/State, |
| | 387 | src/osg/Referenced.cpp, src/osg/State.cpp, |
| | 388 | src/osgWrappers/osg/State.cpp: Fixed effective leak in |
| | 389 | Program::PerContextProgram caused by previously osg::State |
| | 390 | keeping a set of std::ref_ptr<Program::PerContextProgram> without |
| | 391 | ever pruning this list. |
| | 392 | The fix was to convert the osg::State to use C pointers for the |
| | 393 | set of applied PerContexProgram objects, and use the osg::Oberver |
| | 394 | mechanism to avoid dangling pointers for being maintained in |
| | 395 | osg::State. |
| | 396 | |
| | 397 | 2009-01-26 13:48 robert |
| | 398 | |
| | 399 | * src/osgViewer/CMakeLists.txt: Moved the XRANDR include into |
| | 400 | LIB_PRIVATE_HEADERS to avoid FreeBSD build problem |
| | 401 | |
| | 402 | 2009-01-26 10:52 robert |
| | 403 | |
| | 404 | * src/osgWrappers/osgAnimation/AnimationManager.cpp: Updated |
| | 405 | wrappers |
| | 406 | |
| | 407 | 2009-01-26 10:35 robert |
| | 408 | |
| | 409 | * src/osgDB/DatabasePager.cpp: From Rick Appleton, "In |
| | 410 | DatabasePager.cpp I believe there's a copy-paste ommission. A |
| | 411 | little bit further down the file where the Drawables are compiled |
| | 412 | the code is similar to how I have fixed the code here for the |
| | 413 | StateSets. If the DatabasePager thread is supposed to pre-compile |
| | 414 | things, it will call the compileGLObjects such that compileAll |
| | 415 | will be true. However, when compiling StateSets compileAll isn't |
| | 416 | currently checked." |
| | 417 | |
| | 418 | 2009-01-24 10:02 robert |
| | 419 | |
| | 420 | * include/osgAnimation/AnimationManager: Changed META_NodeVisitor |
| | 421 | usage to META_Object as it's more appropriate. |
| | 422 | |
| | 423 | 2009-01-24 10:00 robert |
| | 424 | |
| | 425 | * include/osgAnimation/AnimationManager: From Stephan Huber, "OS X |
| | 426 | failed to compile AnimationManager because of |
| | 427 | the useage of META_Node-macro, but AnimationManager is inherited |
| | 428 | from |
| | 429 | NodeVisitor, so I changed the Macro to META_NodeVisitor" |
| | 430 | |
| | 431 | 2009-01-23 23:04 shuber |
| | 432 | |
| | 433 | * Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj: |
| | 434 | From Stephan Huber: updated XCode project |
| | 435 | |
| | 436 | 2009-01-23 15:52 robert |
| | 437 | |
| | 438 | * src/osgPlugins/dae/daeRMaterials.cpp: From Roland Smeenk, |
| | 439 | "attached is a small crash fix for the case that a texture is |
| | 440 | used for transparency without the availability of a diffuse |
| | 441 | texture." |
| | 442 | |
| | 443 | 2009-01-23 15:50 robert |
| | 444 | |
| | 445 | * include/osgShadow/DebugShadowMap, include/osgShadow/ShadowMap, |
| | 446 | src/osgShadow/DebugShadowMap.cpp, src/osgShadow/ShadowMap.cpp: |
| | 447 | Added forward declaration of callbacks to headers to avoid |
| | 448 | scoping issues of classes with same names. |
| | 449 | |
| | 450 | 2009-01-23 15:12 robert |
| | 451 | |
| | 452 | * include/osg/Export, src/osg/AutoTransform.cpp, |
| | 453 | src/osg/KdTree.cpp, src/osg/Texture.cpp, |
| | 454 | src/osgPlugins/bsp/VBSPData.cpp, |
| | 455 | src/osgPlugins/bsp/VBSPGeometry.cpp: Warning fixes for VS, and |
| | 456 | removal of associated warning disables |
| | 457 | |
| | 458 | 2009-01-23 15:02 robert |
| | 459 | |
| | 460 | * src/osgPlugins/shp/ESRIShape.cpp: Added workaround for silly |
| | 461 | posix read deprecation warning under VS. |
| | 462 | |
| | 463 | 2009-01-23 14:00 robert |
| | 464 | |
| | 465 | * include/osg/Export: Removed unneccesary warning disables |
| | 466 | |
| | 467 | 2009-01-23 11:52 robert |
| | 468 | |
| | 469 | * src/osgPlugins/dicom/ReaderWriterDICOM.cpp: Added range of visual |
| | 470 | rendering properties to readNode's creation of |
| | 471 | VolumeTile/ImageLayer. |
| | 472 | |
| | 473 | 2009-01-23 10:29 robert |
| | 474 | |
| | 475 | * src/OpenThreads/win32/Win32Thread.cpp, |
| | 476 | src/OpenThreads/win32/Win32ThreadPrivateData.h: From Mattias |
| | 477 | Froehlich, "To pass the Microsoft application verifier we have |
| | 478 | tried to get osgviewer |
| | 479 | working with that thing. |
| | 480 | This is what was missing so far: |
| | 481 | |
| | 482 | Make win32 threads behave like the posix implementation when |
| | 483 | setting thread |
| | 484 | cpu affinity. That includes avoid setting thread affininty on a |
| | 485 | non running |
| | 486 | thread. Set that once it is running." |
| | 487 | |
| | 488 | 2009-01-23 09:24 robert |
| | 489 | |
| | 490 | * include/osgVolume/Property, src/osgVolume/VolumeTile.cpp: From |
| | 491 | Lionel Lagarde, "here is a correction on |
| | 492 | osgVolume/Property |
| | 493 | added OSGVOLUME_EXPORT to PropertyAdjustmentCallback |
| | 494 | |
| | 495 | osgVolume/VolumeTile.cpp |
| | 496 | in copy constructor, removed ';' on if |
| | 497 | (volumeTile.getVolumeTechnique())" |
| | 498 | |
| | 499 | |
| | 500 | 2009-01-23 09:22 robert |
| | 501 | |
| | 502 | * src/osgDB/DatabasePager.cpp: Upped notification level of timing |
| | 503 | stats |
| | 504 | |
| | 505 | 2009-01-21 19:28 robert |
| | 506 | |
| | 507 | * src/osgWrappers/osgAnimation/Bone.cpp: Updated wrappers |
| | 508 | |
| | 509 | 2009-01-21 19:02 robert |
| | 510 | |
| | 511 | * examples/osganimationskinning/osganimationskinning.cpp, |
| | 512 | examples/osganimationviewer/AnimtkViewer.cpp, |
| | 513 | include/osgAnimation/Bone, include/osgAnimation/Interpolator, |
| | 514 | include/osgAnimation/Sampler, include/osgAnimation/Skinning, |
| | 515 | src/osgAnimation/RigGeometry.cpp, src/osgAnimation/Skeleton.cpp: |
| | 516 | From Cedric Pinson, "updated osgAnimation with the trunk here the |
| | 517 | update: |
| | 518 | |
| | 519 | examples/osganimationviewer/AnimtkViewer.cpp: |
| | 520 | - add option to display bone (--drawbone) |
| | 521 | - dont crash if the file does not contains a |
| | 522 | AnimationManagerBase, display the content only |
| | 523 | |
| | 524 | examples/osganimationviewer/AnimtkViewerGUI.cpp: |
| | 525 | - adjust the path of image for the gui |
| | 526 | |
| | 527 | include/osgAnimation/Interpolator: |
| | 528 | - add warn message instead of old assert |
| | 529 | |
| | 530 | include/osgAnimation/Bone: |
| | 531 | src/osgAnimation/Skeleton.cpp: |
| | 532 | - change a method name to fit better with what it does. |
| | 533 | setMatrixInSkeletonSpace instead of setBoneInSkeletonSpace |
| | 534 | |
| | 535 | include/osgAnimation/Skinning: |
| | 536 | src/osgAnimation/RigGeometry.cpp: |
| | 537 | - add patch from Fabien Lavignotte to compute normal correctly |
| | 538 | |
| | 539 | include/osgAnimation/Sampler: |
| | 540 | - adjust behviour without assert, return 0 instead of crashing |
| | 541 | " |
| | 542 | |
| | 543 | 2009-01-21 19:01 robert |
| | 544 | |
| | 545 | * examples/osgdrawinstanced/osgdrawinstanced.cpp, |
| | 546 | examples/osgvolume/osgvolume.cpp: Fixed compile errors for when |
| | 547 | ref_ptr<> auto conversion is disabled |
| | 548 | |
| | 549 | 2009-01-21 18:47 robert |
| | 550 | |
| | 551 | * src/osgPlugins/dae/ReaderWriterDAE.cpp, |
| | 552 | src/osgPlugins/dae/daeRGeometry.cpp, |
| | 553 | src/osgPlugins/dae/daeRMaterials.cpp, |
| | 554 | src/osgPlugins/dae/daeReader.cpp, src/osgPlugins/dae/daeReader.h: |
| | 555 | From Roger James, The changes are as follows:- |
| | 556 | |
| | 557 | 1. Support for ambient occlusion maps. |
| | 558 | 2. A fix for the incorrect handling of normals on all geometries. |
| | 559 | The optimizer usually fixed this bug so it probably was not |
| | 560 | noticed very often. |
| | 561 | 3. A new option flag on the reader. "StrictTransparency" |
| | 562 | // Process transparent and transparency settings according to a |
| | 563 | strict interpretation of the spec |
| | 564 | // See https://collada.org/public_forum/viewtopic.php?f=12&t=1210 |
| | 565 | otherwise |
| | 566 | // Jump through various hoops to accomodate the multiplicity of |
| | 567 | different ways |
| | 568 | // that various people have interpreted the specification |
| | 569 | 4. Handling of texures in the transparent channel. This is |
| | 570 | allowed provided that they are the same texture that is specified |
| | 571 | in the diffuse channel. Accomodating a different texture would |
| | 572 | require use of programmable pipeline functionality which I have |
| | 573 | tried to avoid. |
| | 574 | 5. Handling of <bind_vertex_input> elements. |
| | 575 | "" |
| | 576 | |
| | 577 | 2009-01-21 18:34 robert |
| | 578 | |
| | 579 | * CMakeLists.txt, CMakeModules/OsgCPack.cmake, |
| | 580 | CMakeModules/OsgCPackConfig.cmake.in, |
| | 581 | CMakeModules/OsgDetermineCompiler.cmake: From Mattias Helsing, |
| | 582 | "got some feedback from J-S on the packaging so I have changed |
| | 583 | the |
| | 584 | name of the top folder in each package to OpenSceneGraph-x.y.z |
| | 585 | |
| | 586 | Noone else has had an opinion on whether compiler and it's |
| | 587 | version |
| | 588 | should be part of the package filename on their platform/setup so |
| | 589 | I'll |
| | 590 | leave it as is. That is - No action is taken for compilers other |
| | 591 | than |
| | 592 | msvc but one can easily add this information to the cmake cache |
| | 593 | regardless of platform. |
| | 594 | " |
| | 595 | |
| | 596 | 2009-01-21 18:23 robert |
| | 597 | |
| | 598 | * src/osgPlugins/3ds/ReaderWriter3DS.cpp, |
| | 599 | src/osgPlugins/OpenFlight/PaletteRecords.cpp, |
| | 600 | src/osgPlugins/ac/ac3d.cpp, src/osgPlugins/bsp/Q3BSPReader.cpp, |
| | 601 | src/osgPlugins/bsp/VBSPReader.cpp, |
| | 602 | src/osgPlugins/dae/daeRMaterials.cpp, |
| | 603 | src/osgPlugins/dw/ReaderWriterDW.cpp, |
| | 604 | src/osgPlugins/geo/ReaderWriterGEO.cpp, |
| | 605 | src/osgPlugins/ive/DataInputStream.cpp, |
| | 606 | src/osgPlugins/logo/ReaderWriterLOGO.cpp, |
| | 607 | src/osgPlugins/lwo/ReaderWriterLWO.cpp, |
| | 608 | src/osgPlugins/lwo/Surface.cpp, src/osgPlugins/lwo/old_Lwo2.cpp, |
| | 609 | src/osgPlugins/md2/ReaderWriterMD2.cpp, |
| | 610 | src/osgPlugins/mdl/MDLReader.cpp, |
| | 611 | src/osgPlugins/obj/ReaderWriterOBJ.cpp, |
| | 612 | src/osgPlugins/osgViewer/View.cpp, |
| | 613 | src/osgPlugins/osgVolume/ImageLayer.cpp, |
| | 614 | src/osgPlugins/txp/TXPArchive.cpp, |
| | 615 | src/osgPlugins/vrml/ReaderWriterVRML2.cpp, |
| | 616 | src/osgPlugins/x/ReaderWriterDirectX.cpp: Replaced |
| | 617 | readImageFile() usage with readRefImageFile() to prevent |
| | 618 | threading issues with caching of imagery in the osgDB::Registry |
| | 619 | cache. |
| | 620 | |
| | 621 | 2009-01-21 17:10 robert |
| | 622 | |
| | 623 | * src/osgDB/Registry.cpp: From Jason Beverage, "I realized today |
| | 624 | that there is an issue with the Registry changes I submitted to |
| | 625 | allow plugins to have the first go at URLs. |
| | 626 | |
| | 627 | The code works fine as is if the format plugin is not already |
| | 628 | loaded in memory. |
| | 629 | |
| | 630 | If a plugin is already in memory, say the PNG plugin for example, |
| | 631 | then a call to readImageFile("http://server.com/image.png") will |
| | 632 | return FILE_NOT_FOUND because osgDB::findDataFile will not be |
| | 633 | able to locate the file. So the Registry::read method is |
| | 634 | returning before the CURL plugin is given a chance to download |
| | 635 | the file. |
| | 636 | |
| | 637 | I've made a few changes to the Registry to not return |
| | 638 | FILE_NOT_FOUND if the filename contains a URL that fix the |
| | 639 | issue." |
| | 640 | |
| | 641 | 2009-01-21 14:37 robert |
| | 642 | |
| | 643 | * src/osgText/Text.cpp: From Sherman Wilcox, "Minor change to the |
| | 644 | glPushAttrib(...) call in |
| | 645 | renderWithStencilBuffer(...) - added GL_STENCIL_BUFFER_BIT" |
| | 646 | |
| | 647 | 2009-01-21 14:27 robert |
| | 648 | |
| | 649 | * examples/osgvolume/osgvolume.cpp, |
| | 650 | include/osgVolume/RayTracedTechnique, |
| | 651 | include/osgVolume/ShaderTechnique, |
| | 652 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 653 | src/osgPlugins/osgVolume/CMakeLists.txt, |
| | 654 | src/osgPlugins/osgVolume/RayTracedTechnique.cpp, |
| | 655 | src/osgPlugins/osgVolume/ShaderTechnique.cpp, |
| | 656 | src/osgVolume/CMakeLists.txt, |
| | 657 | src/osgVolume/RayTracedTechnique.cpp, |
| | 658 | src/osgVolume/ShaderTechnique.cpp, |
| | 659 | src/osgWrappers/osgVolume/RayTracedTechnique.cpp, |
| | 660 | src/osgWrappers/osgVolume/ShaderTechnique.cpp: Renamed |
| | 661 | ShaderTechnique to RayTracedTechnique |
| | 662 | |
| | 663 | 2009-01-21 12:06 robert |
| | 664 | |
| | 665 | * examples/osgvolume/osgvolume.cpp, src/osgVolume/Property.cpp: |
| | 666 | Cleaned up osgvolume |
| | 667 | |
| | 668 | 2009-01-21 11:46 robert |
| | 669 | |
| | 670 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Property, |
| | 671 | src/osgVolume/Property.cpp, |
| | 672 | src/osgWrappers/osgVolume/Property.cpp: Introduced the ability to |
| | 673 | switch between different visual properties in osgVolume |
| | 674 | |
| | 675 | 2009-01-20 17:53 robert |
| | 676 | |
| | 677 | * src/osgWrappers/genwrapper.conf, |
| | 678 | src/osgWrappers/osgVolume/Property.cpp: Updated wrappers |
| | 679 | |
| | 680 | 2009-01-20 17:41 robert |
| | 681 | |
| | 682 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Property, |
| | 683 | src/osgVolume/CMakeLists.txt, src/osgVolume/Layer.cpp, |
| | 684 | src/osgVolume/Property.cpp, src/osgVolume/ShaderTechnique.cpp, |
| | 685 | src/osgVolume/Shaders/volume_lit_frag.cpp, |
| | 686 | src/osgVolume/Shaders/volume_lit_tf_frag.cpp: Moved |
| | 687 | PropertyAdjustmentCallback from osgvolume.cpp into osgVolume. |
| | 688 | |
| | 689 | Updated lighting shaders. |
| | 690 | |
| | 691 | 2009-01-20 15:30 robert |
| | 692 | |
| | 693 | * src/osgVolume/Shaders/volume_lit.cpp, |
| | 694 | src/osgVolume/Shaders/volume_lit_tf.cpp: Removed redundent shader |
| | 695 | files |
| | 696 | |
| | 697 | 2009-01-20 15:29 robert |
| | 698 | |
| | 699 | * src/osgVolume/ShaderTechnique.cpp, |
| | 700 | src/osgVolume/Shaders/volume_lit.cpp, |
| | 701 | src/osgVolume/Shaders/volume_lit_frag.cpp, |
| | 702 | src/osgVolume/Shaders/volume_lit_tf.cpp, |
| | 703 | src/osgVolume/Shaders/volume_lit_tf_frag.cpp: Added lighting |
| | 704 | based shaders |
| | 705 | |
| | 706 | 2009-01-20 15:06 robert |
| | 707 | |
| | 708 | * examples/osgvolume/osgvolume.cpp: Added event key variables |
| | 709 | |
| | 710 | 2009-01-20 13:50 robert |
| | 711 | |
| | 712 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Property, |
| | 713 | src/osgVolume/Property.cpp, src/osgVolume/ShaderTechnique.cpp, |
| | 714 | src/osgVolume/Shaders/volume_frag.cpp, |
| | 715 | src/osgVolume/Shaders/volume_iso_frag.cpp, |
| | 716 | src/osgVolume/Shaders/volume_mip_frag.cpp, |
| | 717 | src/osgVolume/Shaders/volume_n_frag.cpp, |
| | 718 | src/osgVolume/Shaders/volume_tf_frag.cpp, |
| | 719 | src/osgVolume/Shaders/volume_tf_iso_frag.cpp, |
| | 720 | src/osgVolume/Shaders/volume_tf_mip_frag.cpp, |
| | 721 | src/osgVolume/Shaders/volume_tf_n_frag.cpp: Added support for |
| | 722 | SampleDensityProperty and TransparencyProperty |
| | 723 | |
| | 724 | 2009-01-20 12:39 robert |
| | 725 | |
| | 726 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Property, |
| | 727 | src/osgVolume/FixedFunctionTechnique.cpp, |
| | 728 | src/osgVolume/Property.cpp, src/osgVolume/ShaderTechnique.cpp, |
| | 729 | src/osgVolume/Shaders/volume_frag.cpp, |
| | 730 | src/osgVolume/Shaders/volume_mip_frag.cpp, |
| | 731 | src/osgVolume/Shaders/volume_n_frag.cpp, |
| | 732 | src/osgVolume/Shaders/volume_tf_frag.cpp, |
| | 733 | src/osgVolume/Shaders/volume_tf_mip_frag.cpp, |
| | 734 | src/osgVolume/Shaders/volume_tf_n_frag.cpp: Added AlphaFunc |
| | 735 | support into osgVolume::AlphaFuncProperty. |
| | 736 | |
| | 737 | 2009-01-20 11:34 robert |
| | 738 | |
| | 739 | * src/osgPlugins/dicom/ReaderWriterDICOM.cpp: Fixed compile error |
| | 740 | when using ITK |
| | 741 | |
| | 742 | 2009-01-17 17:23 robert |
| | 743 | |
| | 744 | * examples/osgvolume/osgvolume.cpp: Updated event callback to be |
| | 745 | able to update iso surface value. |
| | 746 | |
| | 747 | 2009-01-17 17:23 robert |
| | 748 | |
| | 749 | * src/osgVolume/ShaderTechnique.cpp, |
| | 750 | src/osgVolume/Shaders/volume_iso_frag.cpp, |
| | 751 | src/osgVolume/Shaders/volume_tf_iso_frag.cpp: Updated Uniform |
| | 752 | name for controlling IsoSurfaceValue |
| | 753 | |
| | 754 | 2009-01-17 16:00 robert |
| | 755 | |
| | 756 | * src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp, |
| | 757 | src/osgWrappers/osgVolume/Layer.cpp, |
| | 758 | src/osgWrappers/osgVolume/Property.cpp, |
| | 759 | src/osgWrappers/osgVolume/VolumeTile.cpp: Updated wrappers |
| | 760 | |
| | 761 | 2009-01-16 17:59 robert |
| | 762 | |
| | 763 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Layer, |
| | 764 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 765 | src/osgVolume/Layer.cpp, src/osgVolume/ShaderTechnique.cpp: |
| | 766 | Removed old volume rendering scene graph code from osgvolume |
| | 767 | example. |
| | 768 | |
| | 769 | Moved createNormalMapTexture and applyTransferFunction functions |
| | 770 | from osgvolume example into include/osgVolume/Layer. |
| | 771 | |
| | 772 | 2009-01-16 16:21 robert |
| | 773 | |
| | 774 | * include/osgVolume/FixedFunctionTechnique, |
| | 775 | src/osgVolume/FixedFunctionTechnique.cpp, |
| | 776 | src/osgVolume/ShaderTechnique.cpp: Completed firt pass |
| | 777 | implementation FixedFunction and ShaderTechnique. |
| | 778 | |
| | 779 | 2009-01-16 11:27 robert |
| | 780 | |
| | 781 | * examples/osgvolume/osgvolume.cpp, |
| | 782 | include/osgVolume/FixedFunctionTechnique, |
| | 783 | include/osgVolume/Property, |
| | 784 | src/osgVolume/FixedFunctionTechnique.cpp, |
| | 785 | src/osgVolume/Property.cpp: Moved basics of fixed function |
| | 786 | pipeline implementation from osgvolume example into osgVolume |
| | 787 | |
| | 788 | 2009-01-16 10:34 robert |
| | 789 | |
| | 790 | * src/osgPlugins/dicom/ReaderWriterDICOM.cpp: Added default use of |
| | 791 | osgVolume::ShaderTechnique |
| | 792 | |
| | 793 | 2009-01-16 10:23 robert |
| | 794 | |
| | 795 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Layer, |
| | 796 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 797 | src/osgPlugins/osgVolume/ImageLayer.cpp, src/osgVolume/Layer.cpp: |
| | 798 | Introduced ImageLayer computeMinMax + rescaling methods, and use |
| | 799 | of rescaleToZeroToOneRange by default. |
| | 800 | |
| | 801 | 2009-01-15 15:57 robert |
| | 802 | |
| | 803 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Layer, |
| | 804 | include/osgVolume/Property, include/osgVolume/VolumeTile, |
| | 805 | src/osgVolume/Layer.cpp, src/osgVolume/Property.cpp, |
| | 806 | src/osgVolume/ShaderTechnique.cpp, src/osgVolume/VolumeTile.cpp: |
| | 807 | Introduce osgVolume::PropertVisitor, and IsoSurface, |
| | 808 | MaximumImageProjection, Ligting and AlphaFunc Properties |
| | 809 | |
| | 810 | 2009-01-15 10:44 robert |
| | 811 | |
| | 812 | * include/osg/Camera, src/osg/Camera.cpp, |
| | 813 | src/osgWrappers/osgTerrain/Terrain.cpp, |
| | 814 | src/osgWrappers/osgVolume/Volume.cpp, |
| | 815 | src/osgWrappers/osgVolume/VolumeTile.cpp: Removal of rendundant |
| | 816 | characters from Camera and Camera.cpp. |
| | 817 | |
| | 818 | Updated wrappers |
| | 819 | |
| | 820 | 2009-01-15 10:36 robert |
| | 821 | |
| | 822 | * include/osg/Camera, src/osg/Camera.cpp: From Rudolf Wiedemann, |
| | 823 | "attached is the osg::Camera class (based on revision 9493), |
| | 824 | where |
| | 825 | methods |
| | 826 | getProjectionMatrixAsOrtho() |
| | 827 | getProjectionMatrixAsFrustum() |
| | 828 | getProjectionMatrixAsPerspective() |
| | 829 | getViewMatrixAsLookAt() (2x) |
| | 830 | are now const, as they only call const methods of osg::Matrixf/d. |
| | 831 | " |
| | 832 | |
| | 833 | 2009-01-14 20:43 robert |
| | 834 | |
| | 835 | * include/osgTerrain/Terrain, include/osgVolume/Volume, |
| | 836 | src/osgPlugins/osgVolume/Volume.cpp: Changed setVolumeTechnique |
| | 837 | to setVolumeTechniquePrototype() |
| | 838 | |
| | 839 | 2009-01-14 20:38 robert |
| | 840 | |
| | 841 | * include/osgVolume/Volume, include/osgVolume/VolumeTile, |
| | 842 | src/osgVolume/ShaderTechnique.cpp: Added VolumeTechnique to |
| | 843 | Volume |
| | 844 | |
| | 845 | 2009-01-14 20:32 robert |
| | 846 | |
| | 847 | * src/osgPlugins/CMakeLists.txt, src/osgPlugins/osgVolume, |
| | 848 | src/osgPlugins/osgVolume/CMakeLists.txt, |
| | 849 | src/osgPlugins/osgVolume/FixedFunctionTechnique.cpp, |
| | 850 | src/osgPlugins/osgVolume/ImageLayer.cpp, |
| | 851 | src/osgPlugins/osgVolume/Layer.cpp, |
| | 852 | src/osgPlugins/osgVolume/Locator.cpp, |
| | 853 | src/osgPlugins/osgVolume/ShaderTechnique.cpp, |
| | 854 | src/osgPlugins/osgVolume/Volume.cpp, |
| | 855 | src/osgPlugins/osgVolume/VolumeTile.cpp: Added osgVolume .osg |
| | 856 | plugin |
| | 857 | |
| | 858 | 2009-01-14 15:16 robert |
| | 859 | |
| | 860 | * examples/osgvolume/osgvolume.cpp, include/osgVolume/Export, |
| | 861 | include/osgVolume/FixedFunctionTechnique, |
| | 862 | include/osgVolume/Layer, include/osgVolume/Locator, |
| | 863 | include/osgVolume/Property, include/osgVolume/ShaderTechnique, |
| | 864 | include/osgVolume/Version, include/osgVolume/Volume, |
| | 865 | include/osgVolume/VolumeTechnique, include/osgVolume/VolumeTile, |
| | 866 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 867 | src/osgVolume/CMakeLists.txt, src/osgVolume/Layer.cpp, |
| | 868 | src/osgVolume/Locator.cpp, src/osgVolume/Property.cpp, |
| | 869 | src/osgVolume/ShaderTechnique.cpp, src/osgVolume/Version.cpp, |
| | 870 | src/osgVolume/Volume.cpp, src/osgVolume/VolumeTechnique.cpp, |
| | 871 | src/osgVolume/VolumeTile.cpp, |
| | 872 | src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp, |
| | 873 | src/osgWrappers/osgVolume/Layer.cpp, |
| | 874 | src/osgWrappers/osgVolume/Property.cpp, |
| | 875 | src/osgWrappers/osgVolume/ShaderTechnique.cpp, |
| | 876 | src/osgWrappers/osgVolume/VolumeTile.cpp: Introduced |
| | 877 | osgVolume::Property, CompositePropery and TransferFunctionPropety |
| | 878 | classes |
| | 879 | |
| | 880 | 2009-01-14 10:32 robert |
| | 881 | |
| | 882 | * src/osgPlugins/OpenFlight/PaletteRecords.cpp: From Lionel |
| | 883 | Lagarde, "The last field of the LightPointAppearancePalette is |
| | 884 | only valid for > 15.8 version of |
| | 885 | the format." |
| | 886 | |
| | 887 | 2009-01-13 17:51 robert |
| | 888 | |
| | 889 | * src/osgVolume/ShaderTechnique.cpp: Integrated state setup code |
| | 890 | from osgvolume.cpp example into ShaderTechnique path. |
| | 891 | |
| | 892 | 2009-01-13 17:20 robert |
| | 893 | |
| | 894 | * examples/osgvolume/osgvolume.cpp, |
| | 895 | include/osgVolume/FixedFunctionTechnique, |
| | 896 | include/osgVolume/ShaderTechnique, include/osgVolume/VolumeTile, |
| | 897 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 898 | src/osgVolume/CMakeLists.txt, |
| | 899 | src/osgVolume/FixedFunctionTechnique.cpp, |
| | 900 | src/osgVolume/Layer.cpp, src/osgVolume/ShaderTechnique.cpp, |
| | 901 | src/osgVolume/Shaders, src/osgVolume/Shaders/volume_frag.cpp, |
| | 902 | src/osgVolume/Shaders/volume_iso_frag.cpp, |
| | 903 | src/osgVolume/Shaders/volume_mip_frag.cpp, |
| | 904 | src/osgVolume/Shaders/volume_n_frag.cpp, |
| | 905 | src/osgVolume/Shaders/volume_tf_frag.cpp, |
| | 906 | src/osgVolume/Shaders/volume_tf_iso_frag.cpp, |
| | 907 | src/osgVolume/Shaders/volume_tf_mip_frag.cpp, |
| | 908 | src/osgVolume/Shaders/volume_tf_n_frag.cpp, |
| | 909 | src/osgVolume/Shaders/volume_vert.cpp, |
| | 910 | src/osgVolume/VolumeTile.cpp: Introduced class interfaces for |
| | 911 | FixedFunctionTechnique and ShaderTechnique volume rendering |
| | 912 | techniques. |
| | 913 | |
| | 914 | 2009-01-13 10:15 robert |
| | 915 | |
| | 916 | * src/osgPlugins/CMakeLists.txt: Added ZLIB_FOUND to dicom |
| | 917 | qualification |
| | 918 | |
| | 919 | 2009-01-13 10:12 robert |
| | 920 | |
| | 921 | * src/osgPlugins/dicom/CMakeLists.txt: Added a / in front of the |
| | 922 | ${DCMTK_ROOT_INCLUDE_DIR} to workaround a CMake bug that ignores |
| | 923 | /usr/local/include directories. |
| | 924 | |
| | 925 | Added ZLIB to include line. |
| | 926 | |
| | 927 | 2009-01-12 17:41 robert |
| | 928 | |
| | 929 | * src/osgPlugins/dicom/CMakeLists.txt: Added test message |
| | 930 | |
| | 931 | 2009-01-12 16:37 robert |
| | 932 | |
| | 933 | * CMakeModules/FindOurDCMTK.cmake, |
| | 934 | src/osgPlugins/dicom/CMakeLists.txt, |
| | 935 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp: Further tweak to |
| | 936 | include paths |
| | 937 | |
| | 938 | 2009-01-12 16:10 robert |
| | 939 | |
| | 940 | * CMakeModules/FindOurDCMTK.cmake, |
| | 941 | src/osgPlugins/dicom/CMakeLists.txt, |
| | 942 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp: Restructured the |
| | 943 | include paths |
| | 944 | |
| | 945 | 2009-01-12 13:12 robert |
| | 946 | |
| | 947 | * examples/osgvolume/osgvolume.cpp: Changed to use ref_ptr<> for |
| | 948 | scene model to avoid crash |
| | 949 | |
| | 950 | 2009-01-12 11:34 robert |
| | 951 | |
| | 952 | * CMakeLists.txt, CMakeModules/OsgCPack.cmake, |
| | 953 | CMakeModules/OsgCPackConfig.cmake.in: From Mattias Helsing, "'ve |
| | 954 | finally finished the rework of the packaging support. It is |
| | 955 | streamlined for tgz and has most of the features that Robert, J-S |
| | 956 | and |
| | 957 | Sukender requested in december. I have an idea of how to discover |
| | 958 | the |
| | 959 | vc80 sp1 or not but haven't had time to implement. The script is |
| | 960 | completely reworked and now doesn't include cmakes' bundled |
| | 961 | CPack.cmake script at all. In summary: |
| | 962 | |
| | 963 | * filenames are |
| | 964 | <package>-<osgversion>-<platform>-<arch>[-compiler]-<configuration>.tar.gz, |
| | 965 | ex. libopenscenegraph-2.7.9-Linux-i386-Release.tar.gz, |
| | 966 | libopenthreads-dev-2.7.9-win32-x86-vc80sp1-Debug.tar.gz |
| | 967 | |
| | 968 | * targets (projects in msvs) are generated for each specified |
| | 969 | component, a target that packages everything that is installed |
| | 970 | (openscenegraph-all) and there's a target for running all other |
| | 971 | packaging targets (Package ALL on msvs, package_ALL in unix |
| | 972 | makefiles). |
| | 973 | |
| | 974 | * It is possible to set the compiler in ccmake (cmake-gui, |
| | 975 | whatever you use) |
| | 976 | |
| | 977 | * the top folder in packages is the same for all packages |
| | 978 | (OpenSceneGraph-x.y) |
| | 979 | |
| | 980 | * the packaging support is limited with cmake-2.6.0 and not as |
| | 981 | dynamic. With cmake-2.6.1 and later building the gdal plugin (for |
| | 982 | example) will create a package_libopenscenegraph-gdal target. |
| | 983 | With |
| | 984 | cmake-2.6.0 only the ones that are always built |
| | 985 | (libopenscenegraph, |
| | 986 | libopenscenegraph-dev, openscenegraph, libopenthreads, |
| | 987 | libopenthreads-dev |
| | 988 | |
| | 989 | * i found a better way to decide whether cpack is available to |
| | 990 | guard |
| | 991 | the BUiLD_OSG_PACKAGES option" |
| | 992 | |
| | 993 | 2009-01-09 19:53 robert |
| | 994 | |
| | 995 | * CMakeLists.txt: From Mattias Helsing, "Following reports by |
| | 996 | Alberto and Simon this submission reenables usage |
| | 997 | of cmake-2.6.0. As a side note I just installed cmake from the |
| | 998 | ubuntu |
| | 999 | repositories and got cmake-2.6.0-4ubuntu2 and this one produced |
| | 1000 | the |
| | 1001 | currect CMAKE_CXX_FLAGS_RELEASE (-O3 -DNDEBUG). This CMakeLists |
| | 1002 | is |
| | 1003 | tested on linux with cmake versions 2.4.8, 2.6.0, 2.6.2 and |
| | 1004 | 2.6.0-4ubuntu2 |
| | 1005 | |
| | 1006 | * Added quotes around CMAKE_CXX_FLAGS var to help cmake-2.6.0 |
| | 1007 | pick up |
| | 1008 | that it really is a string value |
| | 1009 | |
| | 1010 | * Removed quotes around values that we set in |
| | 1011 | OSG_AGGRESIVE_WARNING_FLAGS. This makes |
| | 1012 | OSG_AGGRESIVE_WARING_FLAGS be |
| | 1013 | of LIST type so the foreach constructs can behave as I planned." |
| | 1014 | |
| | 1015 | 2009-01-09 15:57 robert |
| | 1016 | |
| | 1017 | * examples/osganimationskinning/osganimationskinning.cpp: Fixed |
| | 1018 | warning |
| | 1019 | |
| | 1020 | 2009-01-09 15:55 robert |
| | 1021 | |
| | 1022 | * src/osgPlugins/dae/daeRGeometry.cpp, |
| | 1023 | src/osgPlugins/dae/daeRSceneObjects.cpp, |
| | 1024 | src/osgPlugins/dae/daeReader.cpp, src/osgPlugins/dae/daeReader.h, |
| | 1025 | src/osgPlugins/dae/daeWGeometry.cpp, |
| | 1026 | src/osgPlugins/dae/daeWriter.cpp: Fixed warnings |
| | 1027 | |
| | 1028 | 2009-01-09 15:25 robert |
| | 1029 | |
| | 1030 | * CMakeLists.txt, include/osg/Version, |
| | 1031 | packaging/pkgconfig/openscenegraph.pc: Updated version number for |
| | 1032 | next dev release |
| | 1033 | |
| | 1034 | 2009-01-09 15:19 robert |
| | 1035 | |
| | 1036 | * examples/osgvolume/osgvolume.cpp, include/osg/ImageUtils, |
| | 1037 | include/osgVolume/ImageUtils, include/osgVolume/Locator, |
| | 1038 | include/osgVolume/VolumeTile, src/osg/CMakeLists.txt, |
| | 1039 | src/osg/ImageUtils.cpp, |
| | 1040 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 1041 | src/osgPlugins/pdf/CMakeLists.txt, |
| | 1042 | src/osgPlugins/pdf/ReaderWriterPDF.cpp, |
| | 1043 | src/osgVolume/CMakeLists.txt, src/osgVolume/ImageUtils.cpp, |
| | 1044 | src/osgVolume/VolumeTile.cpp, |
| | 1045 | src/osgWrappers/osgVolume/Locator.cpp, |
| | 1046 | src/osgWrappers/osgVolume/VolumeTile.cpp: Moved |
| | 1047 | osgVolume::ImageUtils to osg::ImageUtils, updated wrappers, and |
| | 1048 | started moving osgvolume example across to create osgVolume |
| | 1049 | subgraphs |
| | 1050 | |
| | 1051 | 2009-01-09 15:11 robert |
| | 1052 | |
| | 1053 | * src/osgPlugins/bsp/ReaderWriterBSP.cpp: Fix of warning reported |
| | 1054 | on CDash |
| | 1055 | |
| | 1056 | 2009-01-09 15:09 robert |
| | 1057 | |
| | 1058 | * src/osgViewer/GraphicsWindowWin32.cpp, |
| | 1059 | src/osgViewer/PixelBufferWin32.cpp: Fixed warnings reported on |
| | 1060 | CDash |
| | 1061 | |
| | 1062 | 2009-01-09 12:21 robert |
| | 1063 | |
| | 1064 | * src/osgPlugins/dae/daeWTransforms.cpp: From Roland Smeenk, |
| | 1065 | "Attached is a fix for the Collada plugin. A |
| | 1066 | PositionAttitudeTransform wrote its place elements in the wrong |
| | 1067 | order." |
| | 1068 | |
| | 1069 | 2009-01-09 12:17 robert |
| | 1070 | |
| | 1071 | * applications/osgfilecache/osgfilecache.cpp, |
| | 1072 | include/osgDB/FileUtils, src/osgDB/ConvertUTF.cpp, |
| | 1073 | src/osgDB/DatabasePager.cpp, src/osgDB/FileUtils.cpp, |
| | 1074 | src/osgDB/Registry.cpp, src/osgParticle/PrecipitationEffect.cpp, |
| | 1075 | src/osgPlugins/ac/ac3d.cpp, src/osgPlugins/bsp/VBSPEntity.cpp, |
| | 1076 | src/osgPlugins/dw/ReaderWriterDW.cpp, |
| | 1077 | src/osgPlugins/ive/DataOutputStream.cpp, |
| | 1078 | src/osgPlugins/md2/ReaderWriterMD2.cpp, |
| | 1079 | src/osgPlugins/normals/ReaderWriterNormals.cpp, |
| | 1080 | src/osgPlugins/obj/ReaderWriterOBJ.cpp, |
| | 1081 | src/osgPlugins/osg/Texture.cpp, |
| | 1082 | src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp, |
| | 1083 | src/osgPlugins/pnm/ReaderWriterPNM.cpp, |
| | 1084 | src/osgPlugins/tgz/ReaderWriterTGZ.cpp, |
| | 1085 | src/osgPlugins/txp/ReaderWriterTXP.cpp, |
| | 1086 | src/osgPlugins/zip/ReaderWriterZIP.cpp, |
| | 1087 | src/osgShadow/ConvexPolyhedron.cpp, src/osgViewer/Viewer.cpp, |
| | 1088 | src/osgWidget/Util.cpp: From Andy Skinner, fixes for Solaris |
| | 1089 | build |
| | 1090 | |
| | 1091 | 2009-01-08 14:52 robert |
| | 1092 | |
| | 1093 | * examples/osganimationskinning/osganimationskinning.cpp: From |
| | 1094 | Cedric Pinson, "Here the updated osganimationskinning.cpp that |
| | 1095 | works as before" |
| | 1096 | |
| | 1097 | 2009-01-08 12:47 robert |
| | 1098 | |
| | 1099 | * examples/osggeometryshaders/osggeometryshaders.cpp: Added missing |
| | 1100 | *. |
| | 1101 | |
| | 1102 | 2009-01-08 11:35 robert |
| | 1103 | |
| | 1104 | * CMakeLists.txt: Commented out the warning disabling block |
| | 1105 | |
| | 1106 | 2009-01-08 11:28 robert |
| | 1107 | |
| | 1108 | * CMakeLists.txt: From Mattias Helsing, added back in missing wd |
| | 1109 | entries. |
| | 1110 | |
| | 1111 | 2009-01-08 11:26 robert |
| | 1112 | |
| | 1113 | * CMakeLists.txt: From Mattias Helsing, "With msvc90 on vista and |
| | 1114 | cmake-2.6.2 i had to rearrange the blocks |
| | 1115 | that set aggressive warnings in CMAKE_CXX_FLAGS and the on that |
| | 1116 | processes the source tree(s) or the newly set flags wouldn't take |
| | 1117 | effect until second consecutive configure. |
| | 1118 | |
| | 1119 | I also replaced the internally cached variables that managed the |
| | 1120 | aggresive warnings with explicit adding and removing of flags in |
| | 1121 | CXX_FLAGS |
| | 1122 | |
| | 1123 | For apple we first required min cmake version 2.6.0 and then had |
| | 1124 | code |
| | 1125 | warning about using 2.4.x" |
| | 1126 | |
| | 1127 | 2009-01-08 11:19 robert |
| | 1128 | |
| | 1129 | * include/osg/GLExtensions, src/osg/State.cpp: Added checked from |
| | 1130 | the ARG version of glDraw*Instanced(). |
| | 1131 | |
| | 1132 | 2009-01-08 11:18 robert |
| | 1133 | |
| | 1134 | * src/osgWrappers/osgAnimation/modified.gw: Removed inappropriate |
| | 1135 | file |
| | 1136 | |
| | 1137 | 2009-01-08 11:16 robert |
| | 1138 | |
| | 1139 | * include/OpenThreads/Atomic: From Andy Skinner, "I added a |
| | 1140 | const_cast for a call to atomic_cas_ptr, which takes a void* and |
| | 1141 | has been given a const void* const." |
| | 1142 | |
| | 1143 | 2009-01-08 11:15 robert |
| | 1144 | |
| | 1145 | * include/OpenThreads/Atomic: From Blasius Czink, "It seems there |
| | 1146 | is no atomic_xor_uint_nv(). I |
| | 1147 | attached a changed version of the Atomic header where a mutex |
| | 1148 | fallback |
| | 1149 | is used for "xor" on solaris." |
| | 1150 | |
| | 1151 | 2009-01-08 10:34 robert |
| | 1152 | |
| | 1153 | * CMakeLists.txt, include/osg/Export: Moved supression of VS |
| | 1154 | warning C4706 from the include/osg/Export header into the CMake |
| | 1155 | options list. Added suppression of C4127 as well. |
| | 1156 | |
| | 1157 | 2009-01-07 15:35 robert |
| | 1158 | |
| | 1159 | * include/osg/NodeVisitor: Fixed assingment operator |
| | 1160 | |
| | 1161 | 2009-01-07 15:33 robert |
| | 1162 | |
| | 1163 | * include/osg/Export: Added supression VS warning "C4706: |
| | 1164 | assignment within conditional expression" thanks gets spat out |
| | 1165 | even for perfectly valid if ((variable=expression)) {} usage. |
| | 1166 | |
| | 1167 | 2009-01-07 14:49 robert |
| | 1168 | |
| | 1169 | * src/osgViewer/CompositeViewer.cpp, src/osgViewer/View.cpp: Added |
| | 1170 | handling of when a View isn't yet assigned to a Viewer to avoid |
| | 1171 | associated crash |
| | 1172 | |
| | 1173 | 2009-01-07 13:16 robert |
| | 1174 | |
| | 1175 | * src/osgWrappers/osg/NodeVisitor.cpp, |
| | 1176 | src/osgWrappers/osgAnimation/Bone.cpp, |
| | 1177 | src/osgWrappers/osgAnimation/Timeline.cpp, |
| | 1178 | src/osgWrappers/osgAnimation/VertexInfluence.cpp, |
| | 1179 | src/osgWrappers/osgAnimation/modified.gw, |
| | 1180 | src/osgWrappers/osgTerrain/Layer.cpp, |
| | 1181 | src/osgWrappers/osgViewer/ViewerEventHandlers.cpp: Updated |
| | 1182 | wrappers |
| | 1183 | |
| | 1184 | 2009-01-07 12:27 robert |
| | 1185 | |
| | 1186 | * src/osg/Geometry.cpp, src/osg/GraphicsThread.cpp, |
| | 1187 | src/osg/Hint.cpp, src/osg/KdTree.cpp, |
| | 1188 | src/osg/MatrixDecomposition.cpp, src/osg/OcclusionQueryNode.cpp, |
| | 1189 | src/osgDB/DatabasePager.cpp, src/osgDB/ImagePager.cpp, |
| | 1190 | src/osgDB/Registry.cpp, |
| | 1191 | src/osgGA/CameraViewSwitchManipulator.cpp: Fixed warnings |
| | 1192 | |
| | 1193 | 2009-01-07 11:24 robert |
| | 1194 | |
| | 1195 | * examples/osganimationmakepath/osganimationmakepath.cpp, |
| | 1196 | examples/osganimationnode/osganimationnode.cpp, |
| | 1197 | examples/osganimationskinning/osganimationskinning.cpp, |
| | 1198 | examples/osganimationsolid/osganimationsolid.cpp, |
| | 1199 | examples/osganimationtimeline/osganimationtimeline.cpp, |
| | 1200 | examples/osganimationviewer/AnimtkViewerGUI.cpp, |
| | 1201 | examples/osganimationviewer/AnimtkViewerKeyHandler.cpp, |
| | 1202 | examples/osgdrawinstanced/osgdrawinstanced.cpp, |
| | 1203 | examples/osggeometryshaders/osggeometryshaders.cpp, |
| | 1204 | examples/osghud/osghud.cpp, |
| | 1205 | examples/osgimagesequence/osgimagesequence.cpp, |
| | 1206 | examples/osgmemorytest/osgmemorytest.cpp, |
| | 1207 | examples/osgterrain/osgterrain.cpp, |
| | 1208 | examples/osgunittests/UnitTestFramework.h, |
| | 1209 | src/OpenThreads/win32/Win32Thread.cpp, src/osg/dxtctool.h, |
| | 1210 | src/osgDB/DynamicLibrary.cpp, src/osgDB/FileUtils.cpp, |
| | 1211 | src/osgGA/CameraViewSwitchManipulator.cpp, |
| | 1212 | src/osgGA/TrackballManipulator.cpp, src/osgGA/UFOManipulator.cpp, |
| | 1213 | src/osgManipulator/RotateCylinderDragger.cpp, |
| | 1214 | src/osgManipulator/RotateSphereDragger.cpp, |
| | 1215 | src/osgManipulator/Scale1DDragger.cpp, |
| | 1216 | src/osgManipulator/Scale2DDragger.cpp, |
| | 1217 | src/osgManipulator/Translate1DDragger.cpp, |
| | 1218 | src/osgManipulator/Translate2DDragger.cpp, |
| | 1219 | src/osgPlugins/OpenFlight/FltExportVisitor.h, |
| | 1220 | src/osgPlugins/OpenFlight/LightSourcePaletteManager.h, |
| | 1221 | src/osgPlugins/OpenFlight/MaterialPaletteManager.h, |
| | 1222 | src/osgPlugins/OpenFlight/TexturePaletteManager.h, |
| | 1223 | src/osgPlugins/geo/ReaderWriterGEO.cpp, |
| | 1224 | src/osgPlugins/hdr/ReaderWriterHDR.cpp, |
| | 1225 | src/osgPlugins/lwo/iffparser.h, src/osgPlugins/lwo/lwo2parser.h, |
| | 1226 | src/osgPlugins/mdl/MDLReader.cpp, |
| | 1227 | src/osgPlugins/obj/OBJWriterNodeVisitor.h, |
| | 1228 | src/osgPlugins/txp/TXPParser.cpp, |
| | 1229 | src/osgPlugins/txp/TileMapper.cpp, |
| | 1230 | src/osgUtil/TriStrip_tri_stripper.h, |
| | 1231 | src/osgViewer/PixelBufferWin32.cpp, src/osgViewer/View.cpp, |
| | 1232 | src/osgViewer/Viewer.cpp: Fixed warnings |
| | 1233 | |
| | 1234 | 2009-01-07 10:32 robert |
| | 1235 | |
| | 1236 | * include/OpenThreads/ReadWriteMutex, |
| | 1237 | include/osg/TemplatePrimitiveFunctor, include/osgAnimation/Bone, |
| | 1238 | include/osgAnimation/Timeline, |
| | 1239 | include/osgAnimation/VertexInfluence, |
| | 1240 | include/osgDB/ParameterOutput, |
| | 1241 | include/osgGA/CameraViewSwitchManipulator, |
| | 1242 | include/osgSim/ObjectRecordData, include/osgSim/OverlayNode, |
| | 1243 | include/osgTerrain/Layer, include/osgTerrain/ValidDataOperator, |
| | 1244 | include/osgViewer/ViewerEventHandlers, include/osgVolume/Locator, |
| | 1245 | include/osgWidget/Browser, include/osgWidget/EventInterface: |
| | 1246 | Fixed warnings |
| | 1247 | |
| | 1248 | 2009-01-07 09:49 robert |
| | 1249 | |
| | 1250 | * include/osg/NodeVisitor: Added a protected = operator |
| | 1251 | |
| | 1252 | 2009-01-06 19:09 robert |
| | 1253 | |
| | 1254 | * examples/osganimationskinning/osganimationskinning.cpp, |
| | 1255 | include/osgAnimation/Assert, include/osgAnimation/Channel, |
| | 1256 | include/osgAnimation/Interpolator, include/osgAnimation/Sampler, |
| | 1257 | include/osgAnimation/Skinning, |
| | 1258 | src/osgAnimation/AnimationManager.cpp, |
| | 1259 | src/osgAnimation/AnimationManagerBase.cpp, |
| | 1260 | src/osgAnimation/BasicAnimationManager.cpp: Removed the usage of |
| | 1261 | assert to prevent associated compile warnings and to clean up |
| | 1262 | code |
| | 1263 | |
| | 1264 | 2009-01-06 19:08 robert |
| | 1265 | |
| | 1266 | * examples/osganimationviewer/AnimtkViewerGUI.cpp: Updated path to |
| | 1267 | reflect where the new button images are located. |
| | 1268 | |
| | 1269 | 2009-01-06 16:45 robert |
| | 1270 | |
| | 1271 | * examples/osgviewerQT/QOSGWidget.cpp: From Don Leich, "Here are a |
| | 1272 | couple of fixes for the file examples/osgviewerQT/QOSGWidget.cpp |
| | 1273 | to |
| | 1274 | address some OS X issues. Most of these fixes were previously |
| | 1275 | submitted by Julian Scheid. However, this patch however should |
| | 1276 | not break the example for non-OS X builds and has been tested on |
| | 1277 | 64-bit Linux as well as Mac OS X 10.5. |
| | 1278 | |
| | 1279 | o The value returned by QWidget::winId() is not usable as input |
| | 1280 | for |
| | 1281 | WindowData under OS X the way it is for both Windows and Unix. |
| | 1282 | Julian's fix |
| | 1283 | for this uses the Carbon API. Since the fix for X11 in unknown, |
| | 1284 | it is now |
| | 1285 | assumed that OSG has been built with |
| | 1286 | OSG_WINDOWING_SYSTEM='Carbon' for this |
| | 1287 | example to work at all when running under OS X. |
| | 1288 | |
| | 1289 | o The CompositeViewer version would hang on exit with the |
| | 1290 | original timer start |
| | 1291 | argument. Changing the argument value to match the non-composite |
| | 1292 | version |
| | 1293 | seemed to cure the hanging. |
| | 1294 | |
| | 1295 | o Julian's patch altered the setGeometry position to 30/30 in |
| | 1296 | order to see any |
| | 1297 | window decorations. I did not have this problem, but left his |
| | 1298 | changes intact. |
| | 1299 | |
| | 1300 | o The non-composite viewer needed it's camera initialization |
| | 1301 | defered until |
| | 1302 | after the ViewerQOSG's Qt base class had been initialized. |
| | 1303 | Otherwise, the view |
| | 1304 | did not cover the entire window. |
| | 1305 | " |
| | 1306 | |
| | 1307 | 2009-01-06 16:35 robert |
| | 1308 | |
| | 1309 | * src/osgPlugins/Inventor/ConvertFromInventor.cpp: From Ewe |
| | 1310 | Woesnner, "the Inventor loader crashes when a texture could not |
| | 1311 | be loaded. |
| | 1312 | |
| | 1313 | Please find attached a small fix which solves this issue." |
| | 1314 | |
| | 1315 | 2009-01-06 16:16 robert |
| | 1316 | |
| | 1317 | * src/osgWidget/Input.cpp, src/osgWidget/WindowManager.cpp: From |
| | 1318 | Sergey Leontyev, "Some minor(but important) bug fixes for |
| | 1319 | osgWidget: |
| | 1320 | |
| | 1321 | |
| | 1322 | |
| | 1323 | 1. In WindowManager.cpp childRemoved method the second parameter |
| | 1324 | "end" is misleading and |
| | 1325 | |
| | 1326 | should be named "numChildren" instead. It represents how many |
| | 1327 | children to remove. As a result, the method was implemented |
| | 1328 | incorrectly and failed to remove UI objects. So I fixed it. |
| | 1329 | |
| | 1330 | |
| | 1331 | |
| | 1332 | replaced this: |
| | 1333 | |
| | 1334 | |
| | 1335 | |
| | 1336 | void WindowManager::childRemoved(unsigned int start, unsigned int |
| | 1337 | end) { |
| | 1338 | while(start < end) { |
| | 1339 | Window* window = getByIndex(start); |
| | 1340 | |
| | 1341 | if(!window) continue; |
| | 1342 | |
| | 1343 | if(_remove(window)) { |
| | 1344 | window->_index = -1; |
| | 1345 | |
| | 1346 | window->unmanaged(this); |
| | 1347 | } |
| | 1348 | |
| | 1349 | start++; |
| | 1350 | } |
| | 1351 | } |
| | 1352 | |
| | 1353 | |
| | 1354 | |
| | 1355 | with this: |
| | 1356 | |
| | 1357 | void WindowManager::childRemoved(unsigned int start, unsigned int |
| | 1358 | numChildren) { |
| | 1359 | for (unsigned int i = start; i < start+numChildren; i++) |
| | 1360 | { |
| | 1361 | Window* window = getByIndex(i); |
| | 1362 | |
| | 1363 | if(!window) continue; |
| | 1364 | |
| | 1365 | if(_remove(window)) { |
| | 1366 | window->_index = -1; |
| | 1367 | |
| | 1368 | window->unmanaged(this); |
| | 1369 | } |
| | 1370 | } |
| | 1371 | } |
| | 1372 | |
| | 1373 | |
| | 1374 | |
| | 1375 | 2. in Input.cpp |
| | 1376 | |
| | 1377 | |
| | 1378 | |
| | 1379 | The cursor in Input did not get positioned correctly, probably as |
| | 1380 | a left over from the TOP LEFT origin system which is now BOTTOM |
| | 1381 | LEFT. |
| | 1382 | |
| | 1383 | in method positioned() |
| | 1384 | |
| | 1385 | replaced this: |
| | 1386 | |
| | 1387 | _cursor->setOrigin(x + xoffset + 1.0f, y - _cursor->getHeight() + |
| | 1388 | 1.0f); |
| | 1389 | |
| | 1390 | |
| | 1391 | |
| | 1392 | with this: |
| | 1393 | |
| | 1394 | _cursor->setOrigin(x + xoffset + 1.0f, y + 1.0f); |
| | 1395 | |
| | 1396 | |
| | 1397 | |
| | 1398 | Now it is placed correctly. |
| | 1399 | |
| | 1400 | " |
| | 1401 | |
| | 1402 | 2009-01-06 15:41 robert |
| | 1403 | |
| | 1404 | * src/osgWrappers/osg/PrimitiveSet.cpp, |
| | 1405 | src/osgWrappers/osg/State.cpp, src/osgWrappers/osg/Timer.cpp: |
| | 1406 | Updated wrappers |
| | 1407 | |
| | 1408 | 2009-01-06 15:11 robert |
| | 1409 | |
| | 1410 | * examples/CMakeLists.txt, examples/osgdrawinstanced, |
| | 1411 | examples/osgdrawinstanced/CMakeLists.txt, |
| | 1412 | examples/osgdrawinstanced/osgdrawinstanced.cpp: From Paul Martz, |
| | 1413 | example demonstating new draw instanced primitive funcitonality. |
| | 1414 | |
| | 1415 | 2009-01-06 14:55 robert |
| | 1416 | |
| | 1417 | * include/osg/PrimitiveSet, include/osg/State, |
| | 1418 | src/osg/PrimitiveSet.cpp, src/osg/State.cpp, |
| | 1419 | src/osgPlugins/ive/IveVersion.h, |
| | 1420 | src/osgPlugins/ive/PrimitiveSet.cpp, |
| | 1421 | src/osgPlugins/osg/Geometry.cpp: Added support for primitive |
| | 1422 | instancing |
| | 1423 | |
| | 1424 | 2009-01-05 18:07 robert |
| | 1425 | |
| | 1426 | * CMakeLists.txt: From Jean-Sebastien Guay, changed VS aggressive |
| | 1427 | warnings setting to just /W4. |
| | 1428 | |
| | 1429 | 2009-01-05 17:52 robert |
| | 1430 | |
| | 1431 | * examples/osgviewerQT/QOSGWidget.cpp: From Don Leich, build fix |
| | 1432 | for OSX. |
| | 1433 | |
| | 1434 | 2009-01-05 17:35 robert |
| | 1435 | |
| | 1436 | * src/osgDB/Registry.cpp: From Jason Beverage, "I thought about the |
| | 1437 | issue I was having with the CURL plugin automatically trying to |
| | 1438 | download all filenames with URL's rather than passing the full |
| | 1439 | URL to the plugin. It turns out the solution was pretty simple. |
| | 1440 | |
| | 1441 | I've made a small change to Registry.cpp that puts the CURL logic |
| | 1442 | AFTER the URL has been passed to the plugin rather than assuming |
| | 1443 | all URL's need to be downloaded by the CURL plugin. This way, |
| | 1444 | plugins can have first crack at the URL's, and if they don't |
| | 1445 | handle it the previous CURL behavior kicks in." |
| | 1446 | |
| | 1447 | 2009-01-05 17:06 robert |
| | 1448 | |
| | 1449 | * examples/osgpoints/osgpoints.cpp: From Paul Martz, added --points |
| | 1450 | option for forcing points rendering of polygonal models |
| | 1451 | |
| | 1452 | 2009-01-05 16:53 robert |
| | 1453 | |
| | 1454 | * include/osgGA/CameraViewSwitchManipulator, |
| | 1455 | src/osgGA/CMakeLists.txt, |
| | 1456 | src/osgGA/CameraViewSwitchManipulator.cpp, |
| | 1457 | src/osgPlugins/dae/daeRSceneObjects.cpp, |
| | 1458 | src/osgPlugins/dae/daeWSceneObjects.cpp, |
| | 1459 | src/osgPlugins/dae/daeWriter.h: From Roland Smeenk, "Attached you |
| | 1460 | will find an improved Collada plugin to properly support |
| | 1461 | camera's. |
| | 1462 | A Collada camera will be added to the scenegraph as |
| | 1463 | osg::CameraView. This allows the user to create a set of |
| | 1464 | predefined camera viewpoints. I also added a new |
| | 1465 | MatrixManipulator to osgGA called CameraViewSwitchManipulator and |
| | 1466 | added usage of this to the osgviewer example. This manipulator |
| | 1467 | allows switching between the predefined camera viewpoints. The |
| | 1468 | current design limition I ran into is that a MatrixManipulator |
| | 1469 | only manipulates the ViewMatrix, but for this particular |
| | 1470 | manipulator I also want to update the projectionMatrix of the |
| | 1471 | camera when switching to a new viewpoint. This is not implemented |
| | 1472 | because I don't know what would be the best way to design it. Any |
| | 1473 | ideas? |
| | 1474 | |
| | 1475 | Furthermore Collada also supports orthographic camera's, where an |
| | 1476 | osg::CameraView only supports a perspective camera. Would it be |
| | 1477 | useful to create a CameraView with customizable optics for this?" |
| | 1478 | |
| | 1479 | 2009-01-05 12:21 robert |
| | 1480 | |
| | 1481 | * src/osgWrappers/osgVolume/Layer.cpp, |
| | 1482 | src/osgWrappers/osgVolume/Locator.cpp, |
| | 1483 | src/osgWrappers/osgWidget/Label.cpp: Updated wrappers |
| | 1484 | |
| | 1485 | 2009-01-05 11:58 robert |
| | 1486 | |
| | 1487 | * include/osg/Timer: From Paul Martz, Correction to Timer method |
| | 1488 | comment. |
| | 1489 | |
| | 1490 | 2009-01-05 11:31 robert |
| | 1491 | |
| | 1492 | * include/osgWidget/Label: From Cedric Pinson, added non const |
| | 1493 | getText() method |
| | 1494 | |
| | 1495 | 2009-01-05 11:26 robert |
| | 1496 | |
| | 1497 | * include/osg/BoundingSphere, include/osgTerrain/Locator, |
| | 1498 | include/osgVolume/Layer, include/osgVolume/Locator, |
| | 1499 | src/osgTerrain/Locator.cpp, src/osgVolume/CMakeLists.txt, |
| | 1500 | src/osgVolume/Layer.cpp, src/osgVolume/Locator.cpp: Introduced |
| | 1501 | osgVolume::Layer and Locator classes mirrroring similar classes |
| | 1502 | in osgTerrain. |
| | 1503 | |
| | 1504 | 2009-01-05 10:13 robert |
| | 1505 | |
| | 1506 | * CMakeLists.txt: Change the aggressive warning level under VS to |
| | 1507 | /W3 |
| | 1508 | |
| | 1509 | 2008-12-24 11:05 robert |
| | 1510 | |
| | 1511 | * src/osgPlugins/vtf/ReaderWriterVTF.cpp: Fixed warning |
| | 1512 | |
| | 1513 | 2008-12-24 10:30 robert |
| | 1514 | |
| | 1515 | * src/osgPlugins/bsp/VBSPEntity.cpp, |
| | 1516 | src/osgPlugins/bsp/VBSPGeometry.cpp, |
| | 1517 | src/osgPlugins/bsp/VBSPReader.cpp: Fixed warnings |
| | 1518 | |
| | 1519 | 2008-12-22 21:17 robert |
| | 1520 | |
| | 1521 | * CMakeLists.txt: Made aggressive warnings the default. |
| | 1522 | |
| | 1523 | 2008-12-22 21:16 robert |
| | 1524 | |
| | 1525 | * src/osgPlugins/mdl/BodyPart.cpp, |
| | 1526 | src/osgPlugins/mdl/MDLReader.cpp, src/osgPlugins/mdl/MDLRoot.cpp, |
| | 1527 | src/osgPlugins/mdl/Model.cpp, src/osgPlugins/mdl/VTXReader.cpp, |
| | 1528 | src/osgPlugins/mdl/VVDReader.cpp: Fixed warnings |
| | 1529 | |
| | 1530 | 2008-12-22 18:30 robert |
| | 1531 | |
| | 1532 | * src/osgPlugins/mdl/MDLReader.h, src/osgPlugins/mdl/VVDReader.h: |
| | 1533 | Build fix |
| | 1534 | |
| | 1535 | 2008-12-22 08:26 robert |
| | 1536 | |
| | 1537 | * applications/osgconv/osgconv.cpp: From Paul Martz, "Typing |
| | 1538 | "osgconv" alone displays the --help family of options, as it |
| | 1539 | should, but it also displays info about --formats and --plugins, |
| | 1540 | which seems out of place because no other options are mentioned |
| | 1541 | here. |
| | 1542 | |
| | 1543 | The code changes osgconv so that "osgconv --help" displays help |
| | 1544 | info about --formats and --plugins, plus it also displays |
| | 1545 | documentation for --format and --plugin, which were previously |
| | 1546 | missing." |
| | 1547 | |
| | 1548 | 2008-12-21 20:42 robert |
| | 1549 | |
| | 1550 | * include/osgVolume/VolumeTile, |
| | 1551 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 1552 | src/osgVolume/VolumeTile.cpp, |
| | 1553 | src/osgWrappers/osgVolume/VolumeTile.cpp: Changed |
| | 1554 | VolumeTile::setImage(Image*) to setImage(uint i, Image*) to allow |
| | 1555 | multiple images to be attached to single tile |
| | 1556 | |
| | 1557 | 2008-12-21 20:24 robert |
| | 1558 | |
| | 1559 | * CMakeLists.txt: From Mattias Helsing, "Replace the IF(POLICY |
| | 1560 | CMP0008) with an absolute version check for |
| | 1561 | cmake > 2.6.0. |
| | 1562 | The POLICY keyword is only valid starting with cmake-2.4.7 so |
| | 1563 | using it |
| | 1564 | broke cmake 2.4.5/6 support." |
| | 1565 | |
| | 1566 | 2008-12-20 20:55 robert |
| | 1567 | |
| | 1568 | * include/osgVolume/Brick, include/osgVolume/Volume, |
| | 1569 | include/osgVolume/VolumeTechnique, include/osgVolume/VolumeTile, |
| | 1570 | src/osgPlugins/dicom/CMakeLists.txt, |
| | 1571 | src/osgPlugins/dicom/ReaderWriterDICOM.cpp, |
| | 1572 | src/osgVolume/Brick.cpp, src/osgVolume/CMakeLists.txt, |
| | 1573 | src/osgVolume/Volume.cpp, src/osgVolume/VolumeTechnique.cpp, |
| | 1574 | src/osgVolume/VolumeTile.cpp, |
| | 1575 | src/osgWrappers/osgVolume/Brick.cpp, |
| | 1576 | src/osgWrappers/osgVolume/Volume.cpp, |
| | 1577 | src/osgWrappers/osgVolume/VolumeTechnique.cpp, |
| | 1578 | src/osgWrappers/osgVolume/VolumeTile.cpp: Renamed |
| | 1579 | osgVolume::Brick to osgVolume::VolumeTile |
| | 1580 | |
| | 1581 | 2008-12-20 20:30 robert |
| | 1582 | |
| | 1583 | * src/osgPlugins/bsp/Q3BSPReader.cpp: Changed the scale from 0.03 |
| | 1584 | to 0.0254 as the Q3 bsp files are in inches. |
| | 1585 | |
| | 1586 | 2008-12-20 13:35 robert |
| | 1587 | |
| | 1588 | * src/osgDB/FileUtils.cpp, src/osgPlugins/CMakeLists.txt, |
| | 1589 | src/osgPlugins/bsp/CMakeLists.txt, |
| | 1590 | src/osgPlugins/bsp/ReaderWriterBSP.cpp, |
| | 1591 | src/osgPlugins/bsp/ReaderWriterVTF.cpp, |
| | 1592 | src/osgPlugins/bsp/VBSPData.cpp, src/osgPlugins/bsp/VBSPData.h, |
| | 1593 | src/osgPlugins/bsp/VBSPEntity.cpp, |
| | 1594 | src/osgPlugins/bsp/VBSPEntity.h, |
| | 1595 | src/osgPlugins/bsp/VBSPGeometry.cpp, |
| | 1596 | src/osgPlugins/bsp/VBSPGeometry.h, |
| | 1597 | src/osgPlugins/bsp/VBSPReader.cpp, |
| | 1598 | src/osgPlugins/bsp/VBSPReader.h, |
| | 1599 | src/osgPlugins/bsp/VBSP_README.txt, src/osgPlugins/mdl, |
| | 1600 | src/osgPlugins/mdl/BodyPart.cpp, src/osgPlugins/mdl/BodyPart.h, |
| | 1601 | src/osgPlugins/mdl/CMakeLists.txt, |
| | 1602 | src/osgPlugins/mdl/MDLLimits.h, src/osgPlugins/mdl/MDLReader.cpp, |
| | 1603 | src/osgPlugins/mdl/MDLReader.h, src/osgPlugins/mdl/MDLRoot.cpp, |
| | 1604 | src/osgPlugins/mdl/MDLRoot.h, src/osgPlugins/mdl/MDL_README.txt, |
| | 1605 | src/osgPlugins/mdl/Mesh.cpp, src/osgPlugins/mdl/Mesh.h, |
| | 1606 | src/osgPlugins/mdl/Model.cpp, src/osgPlugins/mdl/Model.h, |
| | 1607 | src/osgPlugins/mdl/ReaderWriterMDL.cpp, |
| | 1608 | src/osgPlugins/mdl/ReaderWriterMDL.h, |
| | 1609 | src/osgPlugins/mdl/VTXReader.cpp, src/osgPlugins/mdl/VTXReader.h, |
| | 1610 | src/osgPlugins/mdl/VVDReader.cpp, src/osgPlugins/mdl/VVDReader.h, |
| | 1611 | src/osgPlugins/vtf, src/osgPlugins/vtf/CMakeLists.txt, |
| | 1612 | src/osgPlugins/vtf/ReaderWriterVTF.cpp: From Jason Daly, "'ve |
| | 1613 | been busy working on the Source engine plugins. There are several |
| | 1614 | contributions in this submission: |
| | 1615 | |
| | 1616 | osgDB/FileUtils.cpp: |
| | 1617 | Needed this extra code to allow a true case-insensitive search. |
| | 1618 | This is because the HL2 map and model files are often sloppy with |
| | 1619 | case. For example, the file might look for |
| | 1620 | materials/models/alyx/alyx_sheet.vtf, but the file is actually in |
| | 1621 | materials/Models/Alyx/alyx_sheet.vtf. In case-insensitive mode, |
| | 1622 | the new code recursively disassembles the path and checks each |
| | 1623 | path element without regard to case. In case-sensitive mode, the |
| | 1624 | code behaves exactly as it used to. The new code is also mostly |
| | 1625 | skipped on Windows because of the case-insensitive file system. |
| | 1626 | Previously, I did all of this with custom search code in the .bsp |
| | 1627 | plugin, but this allows the user to tailor the search using |
| | 1628 | OSGFILEPATH. There are some instructions in the plugins' README |
| | 1629 | files about this. |
| | 1630 | |
| | 1631 | osgPlugins/mdl: |
| | 1632 | This is a new plug-in for Half-Life 2 models (as opposed to |
| | 1633 | maps). This allows you to load Source models individually, as |
| | 1634 | well as allowing the .bsp plugin to load models (props) that are |
| | 1635 | embedded into maps. Mdl files can contain simple object (crates, |
| | 1636 | barrels, bottles), as well as fully articulated characters with |
| | 1637 | skeletal animations. Currently, it can load the simple objects. |
| | 1638 | It can also load the characters, but it can't load the skeletons |
| | 1639 | or animations. |
| | 1640 | |
| | 1641 | osgPlugins/bsp: |
| | 1642 | This contains all of the changes needed to load props along with |
| | 1643 | the basic map geometry. There are also |
| | 1644 | several bugs fixed. |
| | 1645 | |
| | 1646 | osgPlugins/vtf: |
| | 1647 | This is the loader for Valve's texture format. Previously, we had |
| | 1648 | agreed to put this in with the bsp plugin, but I didn't think of |
| | 1649 | the .mdl plugin at that time. It's conceivable that a user might |
| | 1650 | want to load models individually (not as part of a map), so the |
| | 1651 | vtf reader does have to be separate. I also fixed a rather |
| | 1652 | significant bug. |
| | 1653 | |
| | 1654 | I tested all of this code on RHEL 5.2 (32-bit), and Fedora 9 |
| | 1655 | (64-bit). I'll be testing on Windows soon. |
| | 1656 | |
| | 1657 | I also attached a simple .mdl file, along with it's associated |
| | 1658 | files and textures. Just extract the tarball into it's own |
| | 1659 | directory, set your OSGFILEPATH to point at that directory, and |
| | 1660 | load the model like this: |
| | 1661 | |
| | 1662 | osgviewer models/props_junk/gascan001a.mdl" |
| | 1663 | |
| | 1664 | 2008-12-20 12:52 robert |
| | 1665 | |
| | 1666 | * src/osgViewer/CMakeLists.txt: Added OPTIONAL into |
| | 1667 | INCLUDE(FindPkgConfig) |
| | 1668 | |
| | 1669 | 2008-12-19 19:04 robert |
| | 1670 | |
| | 1671 | * ChangeLog: Updated ChangeLog for 2.7.8 dev release |
| | 1672 | |