a3f141d4b5From Lee Butler, "The attached ZIP file contains a modified OBJ file format reader which makes smoothing optional for verticies which do not have a normal associated with them in the OBJ input file. The previous behavior was to always smooth at all verticies which did not have surface normals. In this new implementation smoothing is on by default to be compatible with previous behavior. The user can now specify the "generateFacetNormals" option to the reader to use facet normals for verticies where the OBJ file does not specify a normal."
Robert Osfield
2009-11-18 14:08:46 +00:00
2a0497e2c1From Pau Garcia i Quiles, "On Linux/Unix, when you change the system time (for instance, using settimeofday), OSG animations will freeze your application because osg::Timer uses gettimeofday internally on non-Win32 platforms. This is wrong and should be replace with times(2) or clock_gettime(2).
Robert Osfield
2009-11-18 13:00:35 +00:00
2f854d4978Fixed primCount default value
Robert Osfield
2009-11-18 12:50:03 +00:00
b7cabac990From Mathias Froechlich, "Attached the collected fixes I needed to compile with all of them. Most notable the __hpux define stuff. The __hpux__ variant seems to be not defined which resulted in a compile error at this time. Consequently I have replaced all occurances of __hpux__ with __hpux. And huge surprise: now osg plugins are found and loaded correctly ... The next notable one is the MSVC_IDE fix which makes the nmake Makefiles cmake generator target behave like the ide one. Showed up because I started to do scripted builds with nmake instead of devenv... The rest is the usual bunch of stuff that just happens during normal coding ..."
Robert Osfield
2009-11-18 12:15:29 +00:00
259daac9a9Updated wrappers
Robert Osfield
2009-11-18 11:26:00 +00:00
4262d10217Added osg::ShaderBinary::readShaderBinaryFile(..) static method
Robert Osfield
2009-11-18 11:25:28 +00:00
f8ab593c4bMoved across to use OSG_FIXED_FUNCTION_AVAILABLE
Robert Osfield
2009-11-17 15:54:20 +00:00
370deba546<iterator>, <stdlib.h> and <ctype.h> includes required for QNX compiler
Robert Osfield
2009-11-17 14:06:07 +00:00
79f766efabAdded OSG_CPP_EXCEPTIONS_AVAILABLE cmake option to enable optional build of plugins and examples that required C++ exceptions
Robert Osfield
2009-11-17 12:55:52 +00:00
f417706b06Converted .ive plugin from using C++ exceptions to using a local equivelant, enabling the build on embedded systems.
Robert Osfield
2009-11-17 12:54:55 +00:00
a8abfd64c4Removed usage of throw
Robert Osfield
2009-11-17 11:36:32 +00:00
817e4818aaFixed Shader constructor
Robert Osfield
2009-11-16 17:50:33 +00:00
e5bdd460d4Replaced catch usage
Robert Osfield
2009-11-16 16:09:50 +00:00
95cf62ec01Removed catch
Robert Osfield
2009-11-16 15:47:32 +00:00
af906310f1Removed throw.
Robert Osfield
2009-11-16 15:17:57 +00:00
03e95d97f1Removed throw.
Robert Osfield
2009-11-16 14:58:31 +00:00
d4c58cf1a1Removed usaged of throw and catch to enable better compatibility with embedded systems that don't support C++ exceptions efficiently.
Robert Osfield
2009-11-16 14:47:52 +00:00
52fbe9723fAdded new osg::ShaderBinary class, and support for it in osg::Shader.
Robert Osfield
2009-11-16 12:32:41 +00:00
22e01d3cbaFrom Cedric Pinson, "After fixing Skeleton, i introduce a compile issue in osganimationhardware example I added a #include <osg/MatrixTransform> to fix it "
Robert Osfield
2009-11-13 13:52:12 +00:00
1049f0709bMoved the GLBeginEndAdapter support out of the blocks of the "#if defined(OSG_GL_VERTEX_FUNCS_AVAILABLE) && !defined(OSG_GLES1_AVAILABLE)" guarded blocks.
Robert Osfield
2009-11-13 13:42:04 +00:00
5842677662From Cedric Pinson, Fix Skeleton to compute correctly bind matrix, fix compile issue on osganimationhardware after fixing Skeleton
Cedric Pinson
2009-11-13 13:39:21 +00:00
cd2d69506bAdded optional finer grained checks for GL errors within Geometry::drawImplementation() to help track down GL errors.
Robert Osfield
2009-11-13 13:25:59 +00:00
b3feedaf0aAdded dummy StateSet at top of scene graph when using ShaderGen to copy with subgrahs that contain no StateSet
Robert Osfield
2009-11-13 12:51:42 +00:00
6649f51ff2From Paul Martz, osgViewer Win32 GL3 context creation support
Robert Osfield
2009-11-13 10:03:02 +00:00
8238396099Added missing export
Robert Osfield
2009-11-13 09:56:47 +00:00
d508934961Introduced the usage of GL_MAX_TEXTURE_IMAGE_UNITS where support in place of the check of GL_MAX_TEXTURE_UNITS.
Robert Osfield
2009-11-12 19:39:50 +00:00
8b141567b9Adapted GLBeginEndAdapter to use state.drawQuad(..) rather than use it's local GL_QUADS emulation.
Robert Osfield
2009-11-12 14:35:44 +00:00
efb9908644Introdced usage of State::drawQuads
Robert Osfield
2009-11-12 12:19:09 +00:00
4374ca23f9Introduced new State::drawQuads(..) convinience method to help out with mapping GL 1.x style calls to GLES2.0 compatible calls.
Robert Osfield
2009-11-12 12:18:33 +00:00
20a5820843Fixed winding of GL_QUADS mapping
Robert Osfield
2009-11-12 12:14:01 +00:00
e166b510c7Improved compatibility with GLES2
Robert Osfield
2009-11-12 12:07:13 +00:00
95d54ba15cAdded glContexVersion, glContextFlags and glContextProfileMask members to osg::GraphicsContext::Traits to support GL3 graphics context creation.
Robert Osfield
2009-11-11 15:25:42 +00:00
05b90497e1From Paul Martz, enabled packed_depth_stencil support for GL3
Robert Osfield
2009-11-11 12:04:06 +00:00
2983bbe6c3Merged runtime fix for Win32 OpenGLES build that avoids usage of wglGetProcAddress.
Robert Osfield
2009-11-11 09:15:03 +00:00
14838aafc5Added OSG_GLES2_FEATURES and OSG_GL3_FEATURES usage where appropriate
Robert Osfield
2009-11-10 19:16:36 +00:00
b199a334d9Introduced OSG_GL*_FEATURES macros defined in include/GL that are set to 0 or 1 according to what the assocoated version of GL is compiled against.
Robert Osfield
2009-11-10 17:01:08 +00:00
d3ab362eaeRemoved debug message
Robert Osfield
2009-11-10 14:59:42 +00:00
6b87322e99From Stephan Huber: updated XCode project
Stephan Maximilian HUBER
2009-11-10 14:31:16 +00:00
b00ff07294Changed default enabling of vertex attribute mapping
Robert Osfield
2009-11-10 12:03:03 +00:00
f159ae0516Removed redundant include of GLU
Robert Osfield
2009-11-10 12:02:40 +00:00
8bba7c9f98Added enabling of lighting, and disabling of mipmapping to help out testing of GLES2 target
Robert Osfield
2009-11-10 12:01:28 +00:00
d0b021568eAdded support for mapping GL_QUADS, GL_QUAD_STRIP and GL_POLYGONS to GL_TRIANGLE equivalents.
Robert Osfield
2009-11-10 11:36:07 +00:00
def04324a4Added the default usage of ShaderGenVisitor to help with GLES2 testing.
Robert Osfield
2009-11-10 11:34:57 +00:00
5b236c685bAdded state.checkGLErrors() calls to help in debugging of GLES 2 port
Robert Osfield
2009-11-10 11:34:31 +00:00
126f83e5b4Added disabling of modes that aren't supported with GLES2
Robert Osfield
2009-11-10 11:28:21 +00:00
d515b69d88Added GL token mappings for standard GL errors numbers for when no GLU is available
Robert Osfield
2009-11-09 11:36:54 +00:00
7fb88a83ffAdded remapping of internal texture formats to GL_RGBA etc when just the number of components is used i.e.
Robert Osfield
2009-11-06 18:06:16 +00:00
aa2bb575c4Added simple textured scene graph test accessible using --texture or -t command line options.
Robert Osfield
2009-11-06 16:51:38 +00:00
4163f15052Fixed build with no automatic conversion of ref_ptr<> to C pointer
Robert Osfield
2009-11-06 16:09:55 +00:00
40f2478b77Fixed build
Robert Osfield
2009-11-06 16:09:16 +00:00
4c01079d57Added dlsymb settting for QNX
Robert Osfield
2009-11-06 13:53:16 +00:00
959cd04097Cleaned up the EGL context config set up.
Robert Osfield
2009-11-06 10:38:22 +00:00
0c8661be5fAdded EGL error checking and changed the egl context configuration settings
Robert Osfield
2009-11-06 10:31:03 +00:00
11fa315fb1Added APIENTRY into glColor*/glNormal* calls and specialized the calls to just GLES1
Robert Osfield
2009-11-05 09:28:10 +00:00
d7d6d2b215Moved glColor/glNormal definitions for GLES1.x from include/osg/GL to src/osg/ArrayDispatchers.cpp to avoid import/export issues on functions.
Robert Osfield
2009-11-04 17:26:59 +00:00
90d3c710c4Reduced the number of aliased attributes to fit within the basic 8 attribute location available on basic GLES2 implementations
Robert Osfield
2009-11-04 12:17:58 +00:00
980c5bd6bbChanged notify to output warnings and normally messages to std::out
Robert Osfield
2009-11-04 12:14:57 +00:00
211ea2f263Added --simple option and associated set up of a very simple geometry and shader scene graph
Robert Osfield
2009-11-04 11:03:13 +00:00
da90b3f90aEnabled the vertex aliasing and projection/modelview uniform setting by default for GLES2 and GL3 targets
Robert Osfield
2009-11-04 11:02:00 +00:00
12ca5156f8Disabled osgteaport for GLES1, GLES2 and GL3 builds
Robert Osfield
2009-11-03 16:49:13 +00:00
8a4956a257Replaced glColor4fv call with osg::State::Color(..)
Robert Osfield
2009-11-03 16:48:48 +00:00
72ff1f40f9From Paul Martz, changes for compiling against OpenGL 3.x
Robert Osfield
2009-11-03 16:34:54 +00:00
8d67c9bb33Disabled the build of plugins that aren't supported under GLES.
Robert Osfield
2009-11-03 15:22:14 +00:00
08903d65a1Fixed handling of GL function pointer setup for GLES1/GLES2 targets
Robert Osfield
2009-11-03 11:10:41 +00:00
9c5409ad8aDisable the default LightModel for GLES1 and GLES2 targets
Robert Osfield
2009-11-01 09:51:26 +00:00
a4639398e8Fixed compile issue with Image.cpp and osgautocapture.cpp under GLES.
Robert Osfield
2009-11-01 09:04:41 +00:00
519c70ea5fFixed compile problem due to name change of getGLXContext to getContext
Robert Osfield
2009-10-31 14:44:43 +00:00
68556419ccFixed build under GLES2
Robert Osfield
2009-10-30 17:16:50 +00:00
93d83010f8Added EGL support into build system for GLES1 + GLES2.
Robert Osfield
2009-10-30 15:17:38 +00:00
0ca4c82e3aFixed for GLES1 build
Robert Osfield
2009-10-30 15:16:44 +00:00
50e10d52d7From Stephan Huber: updated XCode projects
Stephan Maximilian HUBER
2009-10-29 09:54:52 +00:00
d17d7159a1Ported osgUtil, osgDB, osgGA, NodeKits and plugins to compile against OpenGL ES 1.1 and OpenGL ES 2.0.
Robert Osfield
2009-10-28 20:31:57 +00:00
7e7135be59From Cedric Pinson, updates to osganimation example to keep in sync with changes with osgAnimation, and introduction of a hardware skinning example
Robert Osfield
2009-10-28 13:31:24 +00:00
c8901d77a2Fixed build aginst GLES1 and GLES2
Robert Osfield
2009-10-27 19:17:38 +00:00
e720a7a956Fixed build on OpenGLES-1.1 and OpenGLES-2.0 targets
Robert Osfield
2009-10-27 18:07:12 +00:00
8454d414a8From Cedric Pinson, The following commit include: * Refactore of RigGeometry to support hardware skinning * Refactore of Timeline to split Action in differents files * Add example how to use hardware skinning
Cedric Pinson
2009-10-27 15:37:13 +00:00
874a13ee42From Stephan Huber: added missing #define
Stephan Maximilian HUBER
2009-10-27 10:51:20 +00:00
37ee16403aIntroduced usage of OSG_GLES*_AVAILABLE macros to headers and .cpp's to enable building against OpenGL ES 1.x and 2.x headers
Robert Osfield
2009-10-25 11:52:01 +00:00
488d108ae0Updated wrappers
Robert Osfield
2009-10-25 11:46:11 +00:00
c837d34692From Cedric Pinson, Simplify update callback api in osgAnimation, the decision to link is on the manager or user
Cedric Pinson
2009-10-23 20:35:31 +00:00
2ca76844ccAdded missing unbinds of VBO and EBO's to Geometry::drawImplementation(..), fixing crash in osganimationtimeline when stats were enabled
Robert Osfield
2009-10-23 17:27:54 +00:00
a7cb28b166Added includes for OpenGL ES1 and ES2.
Robert Osfield
2009-10-23 16:51:45 +00:00
327b67a305Added CMake support for specifying what OpenGL target and features that the OpenSceneGraph build should use.
Robert Osfield
2009-10-23 13:19:57 +00:00
023fb109a3Updated wrappers
Robert Osfield
2009-10-23 12:28:10 +00:00
f467fe3a9cFixed bug in dispatching per primitive attributes
Robert Osfield
2009-10-23 12:24:22 +00:00
bab4c272d5Added support for Vec4ubArray colour arrays
Robert Osfield
2009-10-23 12:22:18 +00:00
7c1b3b8552Fixed handling of Geometry::_internalOptimizedGeometry in the Geometry::drawImplementation(..)
Robert Osfield
2009-10-23 09:24:44 +00:00
86accb88a9From Stephan Huber: updated XCode project, sensible default config-file
Stephan Maximilian HUBER
2009-10-23 08:21:57 +00:00
d88531c099Added #define for GL_TEXTURE0 as MS gl.h header is still stuck in the nineties....
Robert Osfield
2009-10-22 14:40:35 +00:00
9b6e25cf62Fixed typo and updated wrappers
Robert Osfield
2009-10-22 12:56:41 +00:00
0289e5e5a2From Stephan Huber, compile fix to OSX.
Robert Osfield
2009-10-22 12:41:48 +00:00
01e781f2e9Introduced Cmake generated #defines relevant to optionally compile parts of the OSG for different OpenGL targets
Robert Osfield
2009-10-22 12:06:00 +00:00
b8f7310d50Removed, now inappropriate, references to glBegin/glEnd.
Robert Osfield
2009-10-22 12:04:26 +00:00
7690fee435Updated wrappers
Robert Osfield
2009-10-22 12:03:36 +00:00
d743412605From Cedric Pinson, new StateAttributeCallback replacing StateAttribute::Callback
Robert Osfield
2009-10-22 12:01:06 +00:00
2d38e187fdFrom Cedric Pinson, "Here a patch to be able to clone stateattribute, in order to do that i moved the StateAttribute::Callback structure to a file StateAttributeCallback with the same behavior as NodeCallback. "
Robert Osfield
2009-10-22 10:33:16 +00:00
8efd251b10Removed old and now redundent code paths
Robert Osfield
2009-10-22 10:29:43 +00:00
f9c69fa7bdUpdated wrappers
Robert Osfield
2009-10-22 09:08:42 +00:00
cdf9c4363bFixed type of GLBeginEndAdapter::MultiTexCoord*() and VertexAttrib*(), and fixed the internal offsets used in MultiTexCoord so it properly used the mapping texture_unit = target - GL_TEXTURE0
Robert Osfield
2009-10-22 08:51:51 +00:00