FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • feb0214ddc Introduced streamlined text rendering dispatch code. Robert Osfield 2017-03-17 12:50:15 +00:00
  • 2cefcc8bfc Merge pull request #220 from rickyviking/addPenInputWin32 OpenSceneGraph git repository 2017-03-18 11:17:03 +00:00
  • 896d9a4ee5 small compile fix for ios viewer example gles1 Thomas Hogarth 2017-03-18 07:46:14 +00:00
  • 2841d78653 updated ios build instructions in readme Thomas Hogarth 2017-03-18 07:32:17 +00:00
  • c7af72daae GLES3 now working on iOS, tried to maintain support for have bother gles2 and gles3, allowed avfoundation to be added on iOS, improved iOS example cmake generation Thomas Hogarth 2017-03-18 06:53:32 +00:00
  • 1deaac7508 More gles3 tweaks Thomas Hogarth 2017-03-17 18:01:44 +00:00
  • eea3d559a7 Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in Thomas Hogarth 2017-03-15 01:35:58 +00:00
  • 44e303ad90 Added explict call to state.applyModelViewAndProjectionUniformsIfRequired() when required for better GL3/GlES2 support. Robert Osfield 2017-03-16 15:46:51 +00:00
  • b3ccf02e06 Added PEN input support to GraphicsWindowWin32 with the WM_POINTER* framework available since Windows 8. Fallback on existing WM_TOUCH implementation for actual touch inputs. Riccardo Corsi 2017-03-16 15:32:05 +01:00
  • 5f407b3cc4 Added experimental --shaders path into osgtext example to test out using shaders for text rendering. Robert Osfield 2017-03-14 10:43:52 +00:00
  • 2c2097ce24 Replaced GL_QUADS usage with GL_TRIANGLES to aid portability. Robert Osfield 2017-03-13 17:46:51 +00:00
  • ce0fbabb4e Merge pull request #207 from LaurensVoerman/submitOpenCascade OpenSceneGraph git repository 2017-03-13 15:01:08 +00:00
  • 9ba9221ccf Merge pull request #214 from LaurensVoerman/submit-3.4serializerParticle OpenSceneGraph git repository 2017-03-13 14:27:08 +00:00
  • c364bbb19b Merge pull request #215 from LaurensVoerman/submit-SerializerParticle OpenSceneGraph git repository 2017-03-13 14:25:33 +00:00
  • 75e6889366 fix OpenCascade library list for use with shared libs; added list and options for static lib Laurens Voerman 2017-02-24 16:34:30 +01:00
  • ffbc1167de Added lazy state updating for vertex array object binding/unbinding Robert Osfield 2017-03-13 11:44:34 +00:00
  • a2ce0a0e0f bugfix: read endbracket for fileversion 145 (introduced 25/8/2016) Laurens Voerman 2017-03-06 15:56:49 +01:00
  • a6453ad877 Merge pull request #198 from scrawl/buildswitch OpenSceneGraph git repository 2017-03-11 17:31:27 +00:00
  • f1f6d23eeb Merge pull request #213 from marchelbling/bug/osg-fixes OpenSceneGraph git repository 2017-03-11 15:08:57 +00:00
  • 61782d8f29 Build fixes Robert Osfield 2017-03-11 12:31:19 +00:00
  • 75e4d85681 Merge pull request #211 from D-A-Heitbrink/master OpenSceneGraph git repository 2017-03-11 11:58:20 +00:00
  • 16591a310a Merge pull request #210 from scrawl/programfix_backport OpenSceneGraph git repository 2017-03-11 11:38:18 +00:00
  • 8dd22d9178 Merge pull request #208 from LaurensVoerman/submitRWlas OpenSceneGraph git repository 2017-03-11 11:37:33 +00:00
  • 58b9f5208f Merge pull request #206 from LaurensVoerman/submitLAScmake OpenSceneGraph git repository 2017-03-11 11:36:31 +00:00
  • fea86426ed Merge pull request #205 from LaurensVoerman/submitGTAcmake OpenSceneGraph git repository 2017-03-11 11:35:36 +00:00
  • 36e0fd8f5a Merge pull request #204 from LaurensVoerman/submitFBX2017 OpenSceneGraph git repository 2017-03-11 11:34:56 +00:00
  • 1d8efb1a3a Merge pull request #203 from scrawl/optimizer OpenSceneGraph git repository 2017-03-11 11:34:16 +00:00
  • 1b9e1301cf Fixed typo Nico Kruithof 2017-02-21 21:55:05 +01:00
  • 50649fb2a2 Merge pull request #202 from nicokruithof/master OpenSceneGraph git repository 2017-03-10 17:47:02 +00:00
  • a4b1a4ce29 Fixed handling of VAO's Text with backdrop and per vertex colours Robert Osfield 2017-03-10 17:06:04 +00:00
  • 0eb0656d52 Improved handling of backdrops Robert Osfield 2017-03-10 12:08:22 +00:00
  • 5b78e334a9 Improved the management of the unbinding of VBO's and EBO's Robert Osfield 2017-03-09 18:17:53 +00:00
  • 445f2bfe21 Reordered operations to make code easier to follow Robert Osfield 2017-03-09 18:16:04 +00:00
  • 91564e36b0 Cleaned up VertexArrayState handling Robert Osfield 2017-03-09 17:48:06 +00:00
  • 7f3f995c56 Improved handling of VBO/VAO's in Text3D Robert Osfield 2017-03-09 17:47:27 +00:00
  • 2cad221d80 Cleaned out old code paths Robert Osfield 2017-03-09 17:33:38 +00:00
  • 96760970ed Added setDataVariance(DYNAMIC) to stats text labels that are dyanmically updated. Robert Osfield 2017-03-09 17:01:33 +00:00
  • 7868909f43 Improved the handling of array updates and support for VBO and VAO's. Robert Osfield 2017-03-08 18:15:06 +00:00
  • 854dac5340 Improved the checks against VBO+VAO usage and cleaned up setup. Robert Osfield 2017-03-08 18:12:37 +00:00
  • 9b32395772 Added --counter test Robert Osfield 2017-03-07 13:35:03 +00:00
  • fee826412c Added --plain test to simply basic text testing Robert Osfield 2017-03-07 09:13:29 +00:00
  • 15a90f63b8 fix bug in osgb/osgt/osgx readerwriter causing the osgParticle-SizeInterpolator and -ColorInterpolator to dissapear Laurens Voerman 2017-03-06 15:33:22 +01:00
  • 26878fa7ab Fixed text background tessellation Robert Osfield 2017-03-06 14:37:21 +00:00
  • 796b9f0a9b fix bug in osgb/osgt/osgx readerwriter causing the osgParticle-SizeInterpolator and -ColorInterpolator to dissapear Laurens Voerman 2017-03-06 15:33:22 +01:00
  • 8743c18c5a rewrote las plugin to read in a single pass: more speed, compressed file (.laz) support and better precision. Laurens Voerman 2016-05-25 13:24:15 +02:00
  • e906465dcb Fix commented variable assertions in inventor writer Marc Helbling 2017-03-06 12:54:54 +01:00
  • 18826a9ebc Fix implicit ref_ptr conversions Marc Helbling 2017-03-06 12:49:06 +01:00
  • 4627821e79 Revert bad change in 3ds reader Marc Helbling 2017-03-06 12:29:19 +01:00
  • a97cdebe11 Remove unused offset attribute in MergeArrayVisitor Marc Helbling 2017-03-02 11:36:33 +00:00
  • c765b0b62d Add missing type for attribute merge Marc Helbling 2017-03-02 11:33:47 +00:00
  • bb754b6f0a Moved all vertex array set up to start of Text/Text3D::drawImplementation(). Robert Osfield 2017-03-04 17:20:54 +00:00
  • b88be0fbda Implemented better handling of VertexBufferObjects and ElementBufferObjects in osgText Robert Osfield 2017-03-03 18:31:51 +00:00
  • 59931d1591 Removed unneccessary mutable usage Robert Osfield 2017-03-02 17:05:24 +00:00
  • 1e36a12a17 Updated Attribute and PrimitiveFunctor implementations Robert Osfield 2017-03-02 16:33:09 +00:00
  • a69216a79d Refactored osgText::Tex3D to use a single vertex and normal arrays and a combined set of primitive sets. Deprecated Text3D::RenderMode as it's no longer used. Robert Osfield 2017-03-02 16:11:10 +00:00
  • 4721651dbe Added NEW_APPROACH code path that merges the separate GlyphGeometry arrays and primitives into a single set of arrays and primitives Robert Osfield 2017-03-02 11:12:55 +00:00
  • cfaf72bc56 removed some of the hard coded options in the main funct. d-a-heitbrink 2017-03-01 18:12:46 -06:00
  • 7b3fc0925c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph d-a-heitbrink 2017-03-01 16:12:49 -06:00
  • 69b8d01de6 Add files via upload D-A-Heitbrink 2017-03-01 15:33:19 -06:00
  • f233005988 Merged the decoration vertices with the same vertex arrays used for text glyphs Robert Osfield 2017-03-01 16:43:05 +00:00
  • f4966a96d4 Replaced hardwired glDrawArrays calls with use of osg::DrawElementsUshort. Robert Osfield 2017-03-01 11:51:27 +00:00
  • 23cad1eedd Update travis-ci to use the new more flexible BUILD_OSG_PLUGINS_BY_DEFAULT scrawl 2017-02-07 20:24:03 +01:00
  • c1dd0eb348 Add CMake options to control which osgPlugins/ are built scrawl 2017-02-07 19:30:38 +01:00
  • 256441906f Removed unused member variable Robert Osfield 2017-02-28 17:12:58 +00:00
  • 1290f1584a Removed old Text::GlyphQuads array code paths Robert Osfield 2017-02-28 17:02:02 +00:00
  • 138af70bd8 Merged the Text::GlyphQuads cooordinate arrays Robert Osfield 2017-02-28 16:34:33 +00:00
  • e5685dfca5 Removed old code paths Robert Osfield 2017-02-27 15:15:37 +00:00
  • 80c96cd54f Added option for combining the GlyphQuad::backdropcoords into the GlyphQuad::coords. Robert Osfield 2017-02-27 11:53:42 +00:00
  • 0ec204f6e4 Added StateSetManipulator to osglogo. Robert Osfield 2017-02-27 10:47:14 +00:00
  • 232d227170 Changed Program::apply() to Program::compileGLObjects() to avoid the Program::apply() setting of setLastAppliedProgramObjects for affect current state. Robert Osfield 2016-12-21 11:02:29 +00:00
  • 8adbf322a0 Scaled back the primitives sets set up so they match the requirements of the osgText::Text accordinging to the BackdropType Robert Osfield 2017-02-24 18:25:16 +00:00
  • a84a6bd309 Moved glyph quad setup into dedicated method Robert Osfield 2017-02-24 17:08:48 +00:00
  • ef01913b9a allow library names liblas.lib and liblas_c.lib;fix include dirs typo; link only liblas_c in plugin. Laurens Voerman 2017-02-24 16:21:20 +01:00
  • f8ed554ddb use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug linking with SET(TARGET_LIBRARIES_VARS GTA_LIBRARY) Laurens Voerman 2017-02-24 16:09:13 +01:00
  • 0f899a2a1e added FBX SDK 2017.1 and try to add apple (clang) support (not tested - I have no apple) Laurens Voerman 2017-02-24 15:54:07 +01:00
  • cefecaec10 Removed unused lineNumber Robert Osfield 2017-02-24 11:17:22 +00:00
  • aa621e1a4a Grouped GlyphQuad setup Robert Osfield 2017-02-24 11:08:15 +00:00
  • 4c032723ba Fixed indentation Robert Osfield 2017-02-24 10:40:52 +00:00
  • 93f28d4eee Moved to use of single vector of DrawElementsUShort for backdrops and foreground text quads Robert Osfield 2017-02-24 10:07:01 +00:00
  • c9621ff17a Add missing copy of callbacks when a Transform is replaced by Group scrawl 2017-02-24 07:41:19 +01:00
  • 7e2436aba9 Change the order of optimizations to allow for the possibility of merging Geometries that have just become siblings after the removal of redundant nodes scrawl 2017-02-24 01:08:44 +01:00
  • ef431eec29 Fix unused parameter warning scrawl 2017-02-24 01:07:24 +01:00
  • e0f7d3241a Fix MergeGeometryVisitor to work with a Group instead of Geode scrawl 2017-02-24 01:05:57 +01:00
  • a918306a99 Use asDrawable()/asNode() over dynamic_cast in the Optimizer scrawl 2017-02-24 01:00:49 +01:00
  • 22b8a5cc0f Added missing relaseGLObjects()/resizeGLObjects(). Reordered calls to make it easier to read and see patterns. Robert Osfield 2017-02-23 18:36:35 +00:00
  • b5048d3b74 Cleaned up types Robert Osfield 2017-02-23 18:14:36 +00:00
  • 8ff17ddf52 Restructed and unified the position computation Robert Osfield 2017-02-23 15:45:43 +00:00
  • 7b3ecefcfc Removed the old code paths Robert Osfield 2017-02-22 14:14:03 +00:00
  • f816436771 Removed the unncessary array. Robert Osfield 2017-02-22 12:41:45 +00:00
  • 04d23659b3 Added the option for changing the type of the GlyphQuads::Coords Robert Osfield 2017-02-22 12:07:43 +00:00
  • ec2cb81c65 Fixed typo Nico Kruithof 2017-02-21 21:55:05 +01:00
  • f8dc5c4988 Fixed FadeText when using NEW_APPROACH Robert Osfield 2017-02-21 17:47:54 +00:00
  • cd991eaa97 Refactored the computation of the transforms for the osgText::Text Robert Osfield 2017-02-21 17:07:53 +00:00
  • ad0e6a0f81 Merge pull request #201 from blobfish/moreManipSlop OpenSceneGraph git repository 2017-02-18 10:38:31 +00:00
  • d3a925e675 osgManipulator: Constraint: snap_point_to_grid wants Vec3d instead of Vec3 blobfish 2017-02-14 23:46:27 -05:00
  • 378809f3a8 Added osgvolume command line option "--bg r g b a" to enable customization of the window background colour Robert Osfield 2017-02-13 16:53:37 +00:00
  • 95818b0819 Merge pull request #199 from scrawl/statefix_backport OpenSceneGraph git repository 2017-02-08 14:54:08 +00:00
  • ad0a73273c fix in StateSet.cpp the State::DefineMap::changed flag is not resetted to false after currentDefines are updated Julien Valentin 2016-06-29 16:53:26 +02:00
  • 94061aa9fb Add CMake option to not build deprecated serializers scrawl 2017-02-07 19:30:21 +01:00
  • 71bf79cf6f Merge pull request #197 from scrawl/geodefix OpenSceneGraph git repository 2017-02-03 18:03:13 +00:00