Commit Graph

61 Commits

Author SHA1 Message Date
Robert Osfield
14a563dc9f Ran script to remove trailing spaces and tabs 2012-03-21 17:36:20 +00:00
Robert Osfield
42b709a9f4 From Rafa Gaitan, "I have added the macro SETUP_LIBRARY, similar to SETUP_PLUGIN or
SETUP_EXE, in order to have a unique entry point to build the
libraries. With this changes the android integration will be less
painful (currently is a big IF(ANDROID) for each CMakeLists.txt) and
more maintainable in the future. I hope next submissions will be for
supporting android from my colleague Jorge.
"
2011-03-08 13:51:13 +00:00
Robert Osfield
7a6a226ddd From Todd Furlong, "I made a couple of changes to the osgFX::Outline class (SVN patch attached). I had a couple of issues with it that I was trying to resolve:
1. When an outline object was occluded by another object, the backfacing wireframe was exposed.  To fix that, I removed the disabling of GL_DEPTH_TEST.

2. In some cases, the outline color was the same color as the geometry being drawn instead of the specified color.  I'm not sure I have completely fixed this issue, but I did make some changes to match up to how we do a scribe effect."
2010-09-15 10:50:24 +00:00
Robert Osfield
d23525889e Convertex osg::notify to OSG_INFO etc. 2010-05-28 16:04:56 +00:00
Robert Osfield
3491e29bb0 Added missing .get() to fix build when compiling with no automatic type convention in ref_ptr<> 2010-01-13 11:45:19 +00:00
Robert Osfield
ec9020a23a Added newline at end of file to fix warning 2010-01-08 10:12:02 +00:00
Robert Osfield
ff35d0b9b0 Fixed compile warnings 2009-12-15 14:44:12 +00:00
Robert Osfield
8c7b2c097c Compile fixes for GLES 2009-12-09 09:37:19 +00:00
Robert Osfield
e0154c2d28 From Ulrich Hertlein, "attached is a stencil buffer-based constant-width outline f/x with example. I've also modified osgfxbrowser to setup the stencil buffer accordingly." 2009-12-08 17:41:44 +00:00
Robert Osfield
72ff1f40f9 From Paul Martz, changes for compiling against OpenGL 3.x 2009-11-03 16:34:54 +00:00
Robert Osfield
d17d7159a1 Ported osgUtil, osgDB, osgGA, NodeKits and plugins to compile against OpenGL ES 1.1 and OpenGL ES 2.0. 2009-10-28 20:31:57 +00:00
Robert Osfield
39cecd2a72 From Philip Lowman, "Here's the promised cleanup of the OSG's CMakeLists.txt files for the src/ folder. I'll submit the others separately.
Also, there was also a small bug in osgDB's CMakeLists.txt that was causing an error when I tested with CMake 2.4.4.

IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
was changed to
IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime")
"
2009-03-23 16:01:02 +00:00
Robert Osfield
f3166c2d96 From Sherman Wilcox, added VS versioning information into libs 2009-02-05 14:55:17 +00:00
Robert Osfield
8a6e04b84d Introduce NodeVisitor::className and libraryName() 2008-12-17 12:13:15 +00:00
Robert Osfield
2fefc911fd Set the default setting of LineWidth to 2.0 to ensure that old default behavior
is maintained.
2008-07-16 16:05:43 +00:00
Robert Osfield
c3a4237e3a From Vincent Bourdier, removed line with setWidth(2.0) as this code prevents
user settings of line with.
2008-07-16 16:04:27 +00:00
Robert Osfield
c33f7e5720 Cleaned up the updateStateSet code 2008-07-16 15:58:51 +00:00
Robert Osfield
78964b4baa Reverted the changes for ill fated tweaks for Apple build 2008-04-24 11:34:43 +00:00
Robert Osfield
8ae30c9bfc Refactored the inclusion of the headers in the ADD_LIBRARY so that they aren't
added under OSX.
2008-04-23 20:50:53 +00:00
Robert Osfield
2db68f98a8 Changed the updateStateSet code so that it creates a new StateSet each update
rather than clear and reuse the existing one, this change fixes a threading
issue that occured when the viewer is in DrawThreadPerContext.
2008-03-04 11:52:21 +00:00
Robert Osfield
b20d542317 From David Callu, improved consistency of Version strings and add version support
for osgIntrospection and osgManipulator.
2007-09-05 17:12:24 +00:00
Robert Osfield
92b1e7d53f Changed tabs to four spaces to make merges more straight forward 2007-09-05 17:03:43 +00:00
Robert Osfield
3809d0dad0 Moved the OpenThreads link locally to each lib 2007-05-03 10:06:38 +00:00
Robert Osfield
2e6ee4bb39 Removed old gmake and VisualStudio build files 2007-04-10 13:10:25 +00:00
Robert Osfield
b419fa93ef From Luigi Calori, "when we link against something that comes out from a Find... we ususally have a variable <LINK_VAR_NAME>available like OPENTHREADS_LIBRARY,
so I' ve set up a macro that uses the variable name expanded for linking, and  test if a variable ${LINK_VAR_NAME}_DEBUG
like OPENTHREADS_LIBRARY_DEBUG exists and in case uses it for linking in debug mode.
I' ve also set up FindOpenThreads to set up these variables.
I had to edit the core libraries CMakeLists to add the calls to the macros used.
I' ve tested under MSVC"
2007-03-26 13:02:38 +00:00
Robert Osfield
db6f07f1d6 Ran dos2unx of CMakeLists.txt files 2007-03-08 15:31:36 +00:00
Robert Osfield
f50ed9667a From Eric Wing and others, first cut of CMake build support 2007-03-04 13:05:33 +00:00
Robert Osfield
f1c2694c17 Updated copyright years. 2006-07-18 15:21:48 +00:00
Robert Osfield
240fc9ebee Replaced ref_ptr<>:take with ref_ptr<>:release, and added handling of removeal
of ref_ptr<> operator >.
2006-06-26 20:45:51 +00:00
Robert Osfield
94b4432831 From Thom Carlo, with tweak from Robert Osfield, removed the setting of the outline colour
(the emission part of material) during setup of the Carton effects for the second pass.
2006-02-22 16:05:37 +00:00
Robert Osfield
42e79f93d2 From Marco Jez, typo fix if GL extension name. 2005-11-23 10:15:11 +00:00
Robert Osfield
f78a37be9c Simplified the TangentSpaceGenerator so that is automatically converts any models
with indices to one without indices and then runs the tangent space generation code on the result.
2005-11-22 21:14:26 +00:00
Robert Osfield
0e16b64665 Coverted tabs to space in core libraries. 2005-11-17 13:35:53 +00:00
Robert Osfield
428608e781 Warning fixes for IRIX 2005-05-16 15:51:57 +00:00
Robert Osfield
e82a63ca81 Cross platform build fixes. 2005-05-13 11:11:52 +00:00
Robert Osfield
98126f1706 Moved to standard OSG coding style. 2005-04-29 06:32:13 +00:00
Robert Osfield
a1bda0dab8 Added support for per context extension string.
Note, this required adding a unsigned int context ID to the osg::isGLUExtensionSupported(,)
and osg::isGLExtensionSupported(,) functions.  This may require reimplementation
of end user code to accomodate the new calling convention.
2005-04-26 13:15:27 +00:00
Robert Osfield
16c55531da Preparation for moving osgGL2 out of the core OSG into its own seperate distribution. 2005-04-14 11:28:23 +00:00
Robert Osfield
c30141d6be From Mike Weiblen, "minor patches to osgFX consisting of changing from
"state.matrix.modelview[0]" to the equivalent "state.matrix.modelview".
Per ARB_vertex_program, the "[0]" syntax is supported only when
EXT_vertex_weighting or ARB_vertex_blend are supported."
2005-03-18 09:37:46 +00:00
Robert Osfield
929601f070 Improvements to MultiTextureControl and texture layer handling in osgTerrain::DataSet. 2005-03-09 20:40:31 +00:00
Robert Osfield
6a103aa413 Added osgFX::MultiTextureControl node for managing blending between
different texture layers.
2005-03-09 16:54:10 +00:00
Robert Osfield
de283b315b Changed StaetAttribute::Type so it is an enum list rather than a unsigned int. 2004-10-08 09:18:40 +00:00
Robert Osfield
6227aa6251 Fixes for OSX. 2004-08-13 10:46:04 +00:00
Robert Osfield
009cda4134 From Marco Jez, updates to work with latest StateAttrbiute::compileGLObjects method 2004-08-05 15:14:50 +00:00
Robert Osfield
9885d15ff6 From Mike Weiblen, switched of alpha test on anisotropic effect, due to missing
write of colour.
2004-07-17 10:38:09 +00:00
Robert Osfield
13d5b50bcf From Marco Jez, fix to circular reference which was causing a crash. 2004-03-02 20:05:43 +00:00
Robert Osfield
177eb76244 Fixed osgFX::Scribe so that is handled setting of colour and line width correctly,
by setting up the Materiail and LineWidth attributes within the Scribe constructor.
2003-12-26 16:45:06 +00:00
Robert Osfield
6bdbe942b1 From Marco Jez, fixes to osgFX so that effects are compiled correctly.
Fixed title name of osgkeyboardmouse example.
2003-12-16 23:43:37 +00:00
Robert Osfield
77fce7f6f6 From Mike Wieblen, tweak to GL2 shader 2003-12-09 11:19:52 +00:00
Robert Osfield
f1c4dc3b0d Updates for osgdem. Including new read/writeHeightField() methods. 2003-10-29 11:11:17 +00:00