Riccardo Corsi
511f7be394
Bugfix due to copy-paste typo which prevented multi uv channel mesh to be imported correctly.
2019-07-01 15:11:23 +01:00
Robert Osfield
56e2a03378
Fixed layout
2019-07-01 13:43:29 +01:00
Robert Osfield
5fc917881d
Merge branch 'patch-27' of https://github.com/mp3butcher/OpenSceneGraph into patch-27
2019-07-01 13:42:33 +01:00
Alexey Galitsyn
00e2930fb7
Fix not checking num lock state when remapping keypad keys on Windows.
...
Num lock state was never checked during remapping keypad keys on Windows.
Now when num lock is active, keypad numeric keys and keypad delimeter key
should work as expected (return KEY_KP_0 to KEY_KP_9 and KEY_KP_Decimal
respectivly).
2019-07-01 13:39:33 +01:00
Robert Osfield
fe9c235806
Restructed the setting of the default osgDB::Options so it doesn't override the ObjectCacheHint setting when a user specified osgDB::Options object is passed in.
2019-07-01 12:56:36 +01:00
Robert Osfield
8d505e80a9
Merge branch 'OpenSceneGraph-3.6_vas' of https://github.com/eligovision/OpenSceneGraph into OpenSceneGraph-3.6_vas
2019-07-01 12:33:21 +01:00
Robert Osfield
b6cb11b655
Couldn't resolve warnings coming from the FBX headers so had to suppress warnings.
2019-07-01 12:18:21 +01:00
Laurens Voerman
4b6d9287bc
replaced "if (apm || !apm->valid())"
2019-06-14 15:46:55 +01:00
Laurens Voerman
b41c5bde96
fix typo in header guard.
2019-06-14 15:38:38 +01:00
Laurens Voerman
2ac97b5ece
fix typo in ReaderWriterFBX: writObject -> writeObject
2019-06-14 15:36:18 +01:00
OpenSceneGraph git repository
21c0affe66
Merge pull request #760 from LaurensVoerman/readObject
...
implement readObject for all relevant readerWriters
2019-06-14 15:28:46 +01:00
OpenSceneGraph git repository
68fc6ca610
Merge pull request #759 from AnyOldName3/more-tga
...
Various TGA improvements
2019-06-14 15:01:15 +01:00
OpenSceneGraph git repository
52edc4af8d
Merge pull request #758 from LaurensVoerman/osgt_indentation
...
fix indentation for osgt files for windows dynamic library build.
2019-06-14 14:32:31 +01:00
OpenSceneGraph git repository
c1757aadb4
Merge pull request #757 from LaurensVoerman/rendererNoRefCount
...
fix compile error if OSGUTIL_RENDERBACKEND_USE_REF_PTR not defined in include/osgUtil/RenderLeaf
2019-06-14 14:29:32 +01:00
Julien Valentin
cfd190a9fa
update traversedebug preventing traversal to disable OQN
2019-06-08 01:17:21 +02:00
Julien Valentin
5311d6fb6b
add enable check in traverseQuery
2019-05-31 15:27:18 +02:00
Konstantin S. Matveyev
e31afbf78a
typo fix
2019-05-15 14:35:39 +03:00
valid-ptr
be6bc39016
VertexArrayState's lazy disabling of vertex attributes mechanism major fix: _vertexAttribArrays must be 'shared'
2019-05-15 14:32:09 +03:00
Laurens Voerman
38727ed4b4
implement readObject for all relevant readerWriters
2019-05-14 14:25:30 +02:00
AnyOldName3
8491fd780d
Add support for Targa type 3 and 11 images (greyscale)
2019-05-13 21:56:07 +01:00
Laurens Voerman
3ccdc66717
fix indentation for osgt files for windows dynamic library build.
2019-05-13 17:25:29 +02:00
Laurens Voerman
2f71c55da9
fix compile error if OSGUTIL_RENDERBACKEND_USE_REF_PTR not defined in include/osgUtil/RenderLeaf
2019-05-13 17:02:53 +02:00
AnyOldName3
7b6135f0f7
Avoid wasting memory loading optional TGA fields as RLE image data
2019-05-11 00:00:41 +01:00
AnyOldName3
05e896af7e
Add support for type 9 (colour mapped, compressed) TGA images.
2019-05-10 00:04:49 +01:00
AnyOldName3
33bf30cd8c
Check TGA footer if present to see if attribute channel contains alpha data
2019-05-10 00:04:08 +01:00
Robert Osfield
fd014e3b52
Merged ELSEIF fix from master
2019-05-08 10:17:06 +01:00
Laurens Voerman
3f0c1daaa2
add missing E to ELSIF
...
# Conflicts:
# src/osgViewer/CMakeLists.txt
2019-05-08 09:50:17 +01:00
AnyOldName3
c9fc6e0f79
Consistently check for failed memory allocation
2019-05-08 00:59:40 +01:00
AnyOldName3
348fbfe410
Switch to using safe buffers (fixing a memory leak)
2019-05-08 00:56:42 +01:00
AnyOldName3
47ec2c7951
Cleanup TGA header interpretation
...
* Read the colour map `First Entry Index` field. If non-zero, error out as the format specification is vague as to what it does and different readers interpret it differently.
* Rename the variable that holds the colour map entry size as the existing name could be misinterpreted as the size of the pointer, not the thing pointed to.
* Handle images reporting themselves as 15 bits per pixel in the same way as Truevision's example code.
2019-05-04 01:19:31 +01:00
Robert Osfield
6ea8ebf25a
Fixed indentation
2019-04-26 10:46:04 +01:00
Wei Lisi
2b65555d5f
remove tabs
2019-04-26 10:44:04 +01:00
flashk
2439679b0c
Update fbxRMesh.cpp
2019-04-26 10:43:04 +01:00
Wei Lisi
0cbf839425
clean up
2019-04-26 10:41:05 +01:00
Wei Lisi
82cae6daf4
fix fbx hierarchy issue
2019-04-26 10:41:05 +01:00
Derek Quam
6767ff540b
Fix two bugs introduced when removing the Geode visitor from the FBX
...
exporter.
In the Geometry visitor, use getNodePath to check if the Geometry node
is root instead of getNumParents.
Reset the state inside buildFaces to prevent duplication when a
Group is inside of Group.
2019-04-26 10:30:24 +01:00
Derek Quam
69ebfecfcc
Fix duplicate geometries in FBX export.
...
The fix to allow the export of orphaned Geometry nodes accidentally
duplicated those geometry nodes in 'normal' scene trees. This commit
refactors the code to rely on the visitor to traverse the Geometry as
opposed to traversing the Geometry in the Geode visit and the Geometry
visit.
2019-04-26 10:30:15 +01:00
OpenSceneGraph git repository
3834172342
Merge pull request #745 from eligovision/OpenSceneGraph-3.6_cmake
...
CMake: OSG_WINDOWING_SYSTEM fixed
2019-04-26 09:36:51 +01:00
Konstantin S. Matveyev
036bb7b472
CMake: Win32 option added to OSG_WINDOWING_SYSTEM
2019-04-14 00:47:36 +03:00
valid-ptr
b5dff94107
CMake: OSG_WINDOWING_SYSTEM fixed; FORCE flag removed
2019-04-14 00:08:09 +03:00
Robert Osfield
1784381dc7
cMerge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6
2019-04-12 13:57:35 +01:00
Robert Osfield
9e18a7542b
Added ability to set which tree rendering techniques to build (via --featuers bitmask command line) and
...
output scene to using -o outputfilename.extension command line.
2019-04-12 13:55:39 +01:00
OpenSceneGraph git repository
1c6fd4da9b
Merge pull request #737 from eligovision/OpenSceneGraph-3.6_android
...
osgDB::DynamicLibrary: local lib loading on Android fixed
2019-04-11 12:42:22 +01:00
Konstantin S. Matveyev
e1b3c78013
osgDB::DynamicLibrary: local lib loading on Android fixed
2019-03-29 16:32:58 +03:00
Jeongseok Lee
f263ad29db
Update CMakeModules/FindCOLLADA.cmake
...
Keeping old style operator to align with OSG CMake 2.8.0 support.
Co-Authored-By: eknabe <44489094+eknabe@users.noreply.github.com>
2019-03-26 08:05:06 +00:00
Robert Osfield
dd32ee2945
Added basic load and compile stats collection enabled by --stats command line.
2019-03-25 14:09:04 +00:00
Robert Osfield
0b5cb65cdd
Added a call to the CullSetting::readCommnadLine(..) to make sure the --NO_CULLING and --VIEW_FRUSTUM, --VIEW_FRUSTUM_SIDES command line parameters are honoured
2019-03-25 12:42:28 +00:00
Robert Osfield
a8e78fde99
Added --NO_CULLING, --VIEW_FRSUTUM and --VIEW_FRUSTUM_SIDES/--vfs command line options for setting the Camera CullingMode value
2019-03-25 12:40:41 +00:00
Jeongseok Lee
43b274f65c
Update comments and fix cmake version check
2019-03-21 08:40:33 +00:00
OpenSceneGraph git repository
f97ea3577d
Merge pull request #727 from ccochran/OpenSceneGraph-3.6
...
Fixes Android build for osgViewer.
2019-03-19 14:33:42 +00:00