Commit Graph

  • d3c0a90a3c Updated for rc7 Robert Osfield 2018-04-07 07:18:41 +01:00
  • 6bfca1582e Refactored the way that margin is applied to the text buounding box to prevent growth of the bounding box each time Text::setPosition() is called. Robert Osfield 2018-04-06 20:05:26 +01:00
  • ba4624c437 Updated ChangeLog Robert Osfield 2018-04-06 15:33:42 +01:00
  • c9cce01868 Update ChangeLog Robert Osfield 2018-04-06 14:58:00 +01:00
  • 1866b5ca44 Updated for rc6 Robert Osfield 2018-04-06 14:47:54 +01:00
  • 1145b84f8b Fixed warning Robert Osfield 2018-04-06 14:17:35 +01:00
  • 36f891c6cd Changed TextBase::setAlignment() to use computeGlyphRepresentation(); rather than computePositions(); to address issues seen with calling Text::setAlignment() after calls to Text::setText() Robert Osfield 2018-04-06 14:07:58 +01:00
  • d1c54223cb Added osgtext --alignment test to look the effect of calling Text::setAlignent() before and after the Text::setText(). Robert Osfield 2018-04-06 14:06:50 +01:00
  • 0ce3131ffd Merge pull request #525 from emminizer/fix-windows-export OpenSceneGraph git repository 2018-04-05 18:00:30 +01:00
  • 3d8cc71601 osgDB: Added missing extern OSGDB_EXPORT. Daniel Emminizer 2018-04-05 10:51:24 -04:00
  • 914e60a872 Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation Robert Osfield 2018-04-05 14:14:49 +01:00
  • 4cb697205e Changed DisplaySettings::setShaderHint(..) messages to INFO Robert Osfield 2018-04-05 12:35:36 +01:00
  • 5d54697c29 Updated ChangeLOG and news Robert Osfield 2018-04-05 12:19:56 +01:00
  • edbca390ed mingw: fix compile error in GraphicsWindowWin32.cpp Philippe Renon 2018-04-05 11:21:55 +02:00
  • d468cae86b Remove duplicated and incorrect fetching of 'map_bump' attributes in obj plugin Ralf Habacker 2018-04-04 08:33:55 +02:00
  • 4136621e93 Updated ChangeLog for rc5 Robert Osfield 2018-04-04 15:35:28 +01:00
  • 9168b6e5de Fixed threading crash in osgFX that occurred when an osgFX node is added to the scene being rendered in multiple threaded windows. Robert Osfield 2018-04-04 15:09:43 +01:00
  • 74e74d76d9 Added focus classifiction of handling of keyboard events Robert Osfield 2018-04-04 13:40:51 +01:00
  • b8b105b54e Added EventHandler to report key and mouse events for debugging purposes Robert Osfield 2018-04-04 13:40:06 +01:00
  • 3be15a310e Added -4 command line entry that creates two seperate windows within CompositeViewer Robert Osfield 2018-04-04 12:26:53 +01:00
  • ceed09afea When testing XYZ/ECEF coordinate values that convert to LLA points with latitude = 90.0 or latitude = -90.0, the heights calculated by EllipsoidModel::convertXYZToLatLongHeight have substantial errors. With the provided change, points at the pole are handled more correctly. This has been tested against US NGA GoldData. Frank Bausch 2018-04-04 08:50:39 +01:00
  • 7541bc9d48 Updated rc to 5 Robert Osfield 2018-04-03 17:21:47 +01:00
  • 23c3ea4ecc Merge pull request #518 from emminizer/fix-scroll-event OpenSceneGraph git repository 2018-04-03 17:17:59 +01:00
  • 419c351862 Updated rc number to 4 Robert Osfield 2018-04-03 16:07:46 +01:00
  • 2746f50a7c Updated ChangeLog and NEWS for rc3 Robert Osfield 2018-04-03 16:04:24 +01:00
  • 7c57dd04de missing gles2 check Thomas Hogarth 2018-04-03 15:48:37 +01:00
  • 59eae3260d CompositeViewer: SCROLL event now only goes to view with focus. Includes minor typo fixes. Daniel Emminizer 2018-04-03 10:32:58 -04:00
  • f9f475d76d Added a ShadowTechniue::setShadowedScene() virtual method to make it possible to implement techniques as fascades to other techniques Robert Osfield 2018-04-03 15:29:54 +01:00
  • e888e9621c The attached code (from the 3.6 branch) adds a keepSeparatePoints option to the SHP plugin which makes it possible to avoid merging point features into multi-points, in case you e.g. need to keep separate point attributes. Andreas Ekstrand 2018-04-03 12:42:37 +01:00
  • 3450b9fee8 Removed osgShadow::ShadowVolume as it functionality isn't functional Robert Osfield 2018-04-03 11:35:31 +01:00
  • d0f891ca31 Merge pull request #516 from eligovision/OpenSceneGraph-3.6_program OpenSceneGraph git repository 2018-04-03 12:10:29 +01:00
  • 41f5157c1e osg::Program's compileGLObjects and apply methods fixed for OSG without OSG_GL_FIXED_FUNCTION_AVAILABLE Konstantin S. Matveyev 2018-04-02 23:56:36 +03:00
  • f71513cab5 Rewrote the handling of AutoTransform::setAutoScaleToScreen(bool) functionality so that is disabling CullingActive when switched on. Robert Osfield 2018-04-02 18:26:26 +01:00
  • 6c055e3400 Added __VERSION__<140 check for usage of gl_ClipVertex to avoid GL3 core profile usage issues Robert Osfield 2018-04-02 16:21:20 +01:00
  • 7ed0389051 Restructured merge geometry code to make it easier to follow Robert Osfield 2018-04-02 14:08:47 +01:00
  • 2946ea0759 Fix for MergeGeometryVsiitor bug. Restructured the processing the merge geometry list to avoid missing geometries that aren't binned along with other geometries. Robert Osfield 2018-04-02 11:44:03 +01:00
  • 589905fc38 Removed stray CMAkeLists.txt from TARGET_SRC list Robert Osfield 2018-04-01 10:40:25 +01:00
  • 4cdca85699 Small fix (from the 3.6 branch) in the osgjs plugin, avoiding a double addition of the CullFace attribute when it has been turned off. This resulted in an empty json object in the osgjs file causing warnings in osgjs. Andreas Ekstrand 2018-04-01 10:18:45 +01:00
  • 363a933f25 Updated NEWS and ChangeLog for 3.6.0-rc3 Robert Osfield 2018-03-30 17:52:12 +01:00
  • d0f7b85ae0 Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF Robert Osfield 2018-03-30 16:34:01 +01:00
  • 9d5a22a0aa Added suport for writing to gl_ClipVertex Robert Osfield 2018-03-30 15:27:35 +01:00
  • 88e8b1ede0 To osgclipe example added --text textstring and --simple command line options to test mixing text and clipping Robert Osfield 2018-03-30 15:16:45 +01:00
  • f54403284f Changed Layer::get*Value(..) methods to const Robert Osfield 2018-03-30 12:39:52 +01:00
  • 79b181f9c9 Fixed double calling of TerrainTechnique::init(). Robert Osfield 2018-03-29 11:38:04 +01:00
  • 9526a3c35d Maded TerrainTechnique::setTerrainTile(..), addNeighbour(..), removeNeighbour(..) and containsNeighbour(..) virtual and public to enable implementation of TerrainTechnique that act as a facade to actual TerrainTechnique implementations. Robert Osfield 2018-03-29 11:35:34 +01:00
  • 86b57d552f Updated RC number to 3 Robert Osfield 2018-03-28 14:04:41 +01:00
  • aae5f87d13 Fixed osgDB::findFileInDirectory() handling of directory strings with trailing \ or / that was causing failure to find valid files in otherwise valid directories Robert Osfield 2018-03-28 11:34:52 +01:00
  • 0d386ff3f1 OutputStream writes images using its Options object Haojia Yu 2018-03-27 18:56:38 +08:00
  • fb39450067 Merge pull request #510 from eligovision/OpenSceneGraph-3.6_ios OpenSceneGraph git repository 2018-03-27 08:39:52 +01:00
  • 00e2466bc7 Merge pull request #508 from eligovision/OpenSceneGraph-3.6_plugins OpenSceneGraph git repository 2018-03-27 08:37:29 +01:00
  • 37fabbeecd Merge pull request #509 from eligovision/OpenSceneGraph-3.6_vas OpenSceneGraph git repository 2018-03-27 08:35:57 +01:00
  • a846c0160c GraphicsWindowIOS: multithreaded viewer's mode support added; updated for iOS-11 SDK; view rotations fixed; GLES2, GLES3 preprocessors fixed; tested on iPhone4 and upper Konstantin S. Matveyev 2018-03-26 20:40:14 +03:00
  • cbb9fd4218 VertexArrayState: typo fixed in log Konstantin S. Matveyev 2018-01-19 22:20:01 +03:00
  • 1a86ed4e7a Write support with .curl pseudo extension added Konstantin S. Matveyev 2018-03-26 17:59:49 +03:00
  • 80a2dd924f Updated ChangeLog Robert Osfield 2018-03-26 09:55:53 +01:00
  • aebdefbbf7 Updated NEWS for 3.6.0-rc2 Robert Osfield 2018-03-26 09:54:59 +01:00
  • a399e9ccb2 Re-ordered the creating of the DatagbaseThread to avoid startThread being called twice. Robert Osfield 2018-03-25 12:14:46 +01:00
  • 862c36a08b Added check if thraeding is running before executing start thread. Robert Osfield 2018-03-25 12:13:50 +01:00
  • 6b037372b6 Updated ChangeLog, AUTHORS and Controbitors for 3.6.0-rc1 Robert Osfield 2018-03-24 18:02:35 +00:00
  • ef94f2e391 Added new features in 3.6 to NEWS release Robert Osfield 2018-03-24 17:51:06 +00:00
  • 6c6ae2db60 First step for 3.6 stable release news Robert Osfield 2018-03-24 12:13:59 +00:00
  • 1930d9c345 Fixed read shader to safer ref version Robert Osfield 2018-03-24 11:23:59 +00:00
  • 640e7bc06c Fixed spotlight colour mixing Robert Osfield 2018-03-24 10:59:15 +00:00
  • 46850214df Merge pull request #502 from Haojia521/OutputStreamUseTargertSoVersion OpenSceneGraph git repository 2018-03-23 20:08:37 +00:00
  • 647b578ce6 Removed serailizers that are now supplied by osg::Node Robert Osfield 2018-03-23 19:54:33 +00:00
  • 1d5ae1362a Fixed member variable names to avoid conflicts with osg::Node Robert Osfield 2018-03-23 19:54:01 +00:00
  • 9634688559 Removed Drawable writing out of StateSet as this is now done by Node Robert Osfield 2018-03-23 18:07:36 +00:00
  • 96b586c165 Provide osgemscripten example CMake flags in a more stable way Michael Kapelko 2018-03-23 18:07:07 +03:00
  • b1be6c6def Changed the isBufferObjectSupported flag so that it's true when either VBO or PBO's are supported Robert Osfield 2018-03-23 12:55:00 +00:00
  • b1170621c8 Fixes for VS2008 and 2010 build Paul Obermeier 2018-03-22 17:35:13 +00:00
  • 3c1e29db9f Moved OPENGL_INCLUDE_DIR include into it's own INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) entry to help with FreeBSD builds where a previous rev of the OSG has already been installed Robert Osfield 2018-03-22 16:51:03 +00:00
  • ffb3ed8ef7 Removed typedef and used osg::GraphicsContext::Cameras explictly to avoid any hiding of type Robert Osfield 2018-03-22 09:04:47 +00:00
  • d18f61688d Fixed bug of determining availability of functions ‘pthread_getconcurrency’, ‘pthread_setconcurrency’, ‘pthread_setaffinity_np’ in ‘pthread’ library Victor 2018-03-21 19:44:25 +03:00
  • 7d290daa73 Removed -m message that was causing problems with branch creation Robert Osfield 2018-03-20 09:20:59 +00:00
  • 383161c14c Updated version numbers in prep for 3.6 branch Robert Osfield 2018-03-20 09:12:58 +00:00
  • ba4791a15d Updated ChangeLog and AUTHORS file Robert Osfield 2018-03-20 09:02:05 +00:00
  • 950823fac9 Updated ChangeLog and updated version to 3.5.11 Robert Osfield 2018-03-19 14:27:18 +00:00
  • b563f1bd78 Fixed build issues when building with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF Robert Osfield 2018-03-19 14:08:47 +00:00
  • b38a37c3bb Fixed warnings Robert Osfield 2018-03-19 10:42:09 +00:00
  • b7147ff532 Updated ShaderGen shaders Robert Osfield 2018-03-16 11:33:03 +00:00
  • e5b67a6795 Removed the static osg::Program creation as it's not required Robert Osfield 2018-03-15 16:50:47 +00:00
  • add6b3edee Added --shader saderfilename command line option to enable one to manually specify which shaders to use for the uber program. Robert Osfield 2018-03-15 16:49:58 +00:00
  • 0308dfecf5 Introduced a _specverson to centralizer the control of this variable Robert Osfield 2018-03-15 16:12:40 +00:00
  • d365a6a347 Added support for Collada DOM-2.5 Robert Osfield 2018-03-15 15:58:46 +00:00
  • 8229d19f21 Merge pull request #495 from aitormoreno/fix_installExamplesPDB OpenSceneGraph git repository 2018-03-15 12:53:32 +00:00
  • bcd2adf977 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph into fix_installExamplesPDB Aitor Moreno 2018-03-14 16:56:08 +01:00
  • 79fde49084 (re)fix the installation of the PDB files Aitor Moreno 2018-03-14 16:54:05 +01:00
  • 57f2b1fa27 Standardized the MSCV INSTALL lines between applications and examples Robert Osfield 2018-03-14 08:39:12 +00:00
  • 4447190dd6 Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition. Robert Osfield 2018-03-14 08:22:45 +00:00
  • 5fcaf18025 fix installation of PDB files from the examples. Aitor Moreno 2018-03-13 11:21:35 +01:00
  • 009580676f Merge pull request #494 from pelicanmapping/fix-text-empty-checks OpenSceneGraph git repository 2018-03-13 08:47:53 +00:00
  • 23b94c2468 Text: added code in accept(functor) methods to check for empty vectors before accessing front() element, which was causing a crash in some cases. Also fixed a negated null check in getCharacterCoords gwaldron 2018-03-12 17:35:46 -04:00
  • f8199935fa Fixed renamed of _textureDepth. Yaroslav Tarasov 2018-03-12 16:14:30 +00:00
  • 5c8a5307d6 From Colin McDonald, "If the glCreateProgram in osg::Program fails for any reason, then subsequently Program::PerContextProgram::linkProgram would crash. I've put in some checks to prevent that." Robert Osfield 2018-03-12 15:55:35 +00:00
  • 3f686d8719 Fixed indentation Robert Osfield 2018-03-12 15:29:56 +00:00
  • 7ce1938543 Improved indentation Robert Osfield 2018-03-12 15:12:44 +00:00
  • 556089e6a1 From Raymond de Vries, added support for latest FBX SDK Robert Osfield 2018-03-12 10:43:56 +00:00
  • 957bd4b886 Added FbxLayeredTexture support Robert Osfield 2018-03-12 10:29:04 +00:00
  • 125263f216 Refactored the texture setup to streamline it and make it easier to adapt Robert Osfield 2018-03-10 17:51:52 +00:00
  • 9010fd8035 iOS CMake project generation improvements (bitcode option) Alessandro Terenzi 2018-03-09 10:17:59 +00:00