FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,736 Commits 1 Branch 26 Tags 73 MiB
1596058c10
Commit Graph

15736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenSceneGraph git repository
561b49fb78
Merge pull request #442 from eligovision/OpenSceneGraph_viewer 
osgViewer::ViewerBase setThreadingModel function fixed
 2018-01-13 16:07:56 +00:00
Konstantin S. Matveyev
bb84f1ea3c osgViewer::ViewerBase setThreadingModel func fix: should not start threading, must only restart 2018-01-13 15:49:39 +03:00
Robert Osfield
a810b80b77 Fixed typo and improved readability of description 2018-01-13 11:13:54 +00:00
Robert Osfield
26b06a8daa Merge branch 'master' into shader_pipeline 2018-01-12 19:55:34 +00:00
Robert Osfield
ae57f3cd46 Added ability to toggle on/off use of C system() function call, using OSG_SYSTEM_SUPPORTED Cmake option 2018-01-12 19:52:31 +00:00
Robert Osfield
6a3d9b2aa2 Added os_utils header 2018-01-12 17:03:31 +00:00
Robert Osfield
a7cc9664c0 Renamed EnvVar header to os_utils in prep for adding more OS related calls to it 2018-01-12 16:48:17 +00:00
Robert Osfield
8d170ccfe6 Merge branch 'master' into shader_pipeline 2018-01-11 14:34:11 +00:00
Robert Osfield
eea0cf9642 Merge branch 'master' into shader_pipeline 2018-01-11 14:33:24 +00:00
OpenSceneGraph git repository
bfbae8ad12
Merge pull request #437 from filnet/text_typo 
osgText: fix typos related to SIGNED_DISTANCE_FIELD
 2018-01-11 14:32:53 +00:00
Robert Osfield
e84c93dfce Fixed Linux NVTT build issue by restricting the addition of the new libs to just Windows 2018-01-11 10:10:43 +00:00
Robert Osfield
7d311915e7 Merged NVTT cmake fixes from 3.4 branch 2018-01-11 09:39:27 +00:00
Robert Osfield
f95ca26fab Merge branch 'master' into shader_pipeline 2018-01-11 08:54:53 +00:00
Robert Osfield
0cee5f5d27 Added returns to avoid fall through between case statements 2018-01-11 08:51:08 +00:00
Robert Osfield
6bd2d9054e Moved setFusionDistance() into View::updateSceneView() 2018-01-10 16:55:02 +00:00
Philippe Renon
3e12972a03 osgText: fix typos related to SIGNED_DISTANCE_FIELD 2018-01-10 14:21:25 +01:00
Andreas Ekstrand
0eacd8161a Small fix in the osgjs plugin. Since osgjs uses pixel area for PIXEL_SIZE_ON_SCREEN PagedLOD ranges instead of a diameter, it's a more correct approximation to square the ranges in this case. 2018-01-10 11:07:46 +00:00
Robert Osfield
903b0895f7 Added non const variants of State::getDisplaySettings/getActiveDisplaySettings(). 2018-01-09 12:16:32 +00:00
Robert Osfield
f38575926f Merge branch 'master' into shader_pipeline 2018-01-08 10:53:41 +00:00
Robert Osfield
df280811a1 Merged Program.cpp from shader_pipeline 2018-01-08 10:52:35 +00:00
Robert Osfield
9e7fa60f16 Change index parameter handling to getScalerValue() 2018-01-08 10:49:48 +00:00
Robert Osfield
e65caecf82 Merge branch 'master' into shader_pipeline 2018-01-08 10:46:03 +00:00
Robert Osfield
0fafb385f9 Fixed indentation 2018-01-08 10:31:47 +00:00
Robert Osfield
f866836d60 Added extension support checks 2018-01-08 10:14:13 +00:00
Robert Osfield
818dee31d8 Fixed build with GLES2 2018-01-08 10:04:28 +00:00
Robert Osfield
b45803898d Added suppor for StateSet::DefineList 2018-01-06 14:59:16 +00:00
Robert Osfield
9944d949fc Improvements to lua/OSG integration 2018-01-06 14:57:39 +00:00
Robert Osfield
e677195084 Merge branch 'master' into shader_pipeline 2018-01-06 13:48:28 +00:00
Robert Osfield
2108141b4e Replaced old style access of ValueObject values to new ValueObject::getScaleValue() methods 2018-01-06 13:47:18 +00:00
Robert Osfield
bdff0955dc Added TextureCubeMap::setImage/getImage() methpds 2018-01-06 13:11:36 +00:00
Robert Osfield
3e676f67ff Removed inappropriate // 2018-01-06 13:09:16 +00:00
Robert Osfield
230ee49428 Added ValueObject::get/setScaleValue(..) convinient methods 2018-01-06 12:54:14 +00:00
Robert Osfield
339b7ffa7c Removed inappropriate // 2018-01-06 12:52:34 +00:00
Robert Osfield
6adf226c27 Merge branch 'master' into shader_pipeline 2018-01-06 12:41:41 +00:00
OpenSceneGraph git repository
6a3c88fb5b
Merge pull request #431 from mp3butcher/callbacks 
allow read of script from zip
 2018-01-06 12:37:02 +00:00
OpenSceneGraph git repository
4d4b02848b
Had to fix spacing and bracket position yet again... 2018-01-06 12:31:23 +00:00
Julien Valentin
518048bc64 allow read of zipped script 2018-01-05 19:57:41 +01:00
Robert Osfield
575474a269 Merge branch 'master' into shader_pipeline 2018-01-05 15:20:07 +00:00
Robert Osfield
4abc97f44b Fixed return values 2018-01-05 12:12:24 +00:00
Robert Osfield
6a413da143 Merge branch 'master' into shader_pipeline 2018-01-05 11:35:11 +00:00
OpenSceneGraph git repository
741db16916
Merge pull request #428 from mp3butcher/serializerfixbis 
add Node associate on Drawable serializers
 2018-01-05 11:26:06 +00:00
Robert Osfield
647fc75add Disabled OSX builds as they are consistently failing on travis due to timeouts so a giving false positives for all builds 2018-01-05 10:36:25 +00:00
OpenSceneGraph git repository
eca7831281
Merge pull request #424 from mp3butcher/osgSampler 
GL3.3 SamplerObject as StateAttribute
 2018-01-05 09:43:16 +00:00
OpenSceneGraph git repository
f5108459be
Fixed indentation and spacing issues 2018-01-05 09:41:32 +00:00
OpenSceneGraph git repository
6ef90054bc
Merge pull request #425 from mp3butcher/callbacks 
Support for multiple nest Camera DrawCallbacks
 2018-01-05 09:18:39 +00:00
Julien Valentin
e33a407aaf add BufferData associate to Image and subclasses 2018-01-04 22:50:30 +01:00
OpenSceneGraph git repository
73689caa5f
Had to fix positioning of { and spacing to be consistent with the rest of the OSG 2018-01-04 15:28:45 +00:00
OpenSceneGraph git repository
70488271bd
Merge pull request #426 from mp3butcher/moreExtensions 
add more Extensions
 2018-01-04 15:20:57 +00:00
Julien Valentin
196256fdcd Evolve DSO 
add Node associate on Drawable based:
Drawable
Geometry
DrawPixels.cpp
ShapeDrawable.cpp
RigGeometry.cpp
ConnectedParticleSystem.cpp
FadeText.cpp
Text.cpp
Text3D.cpp
TextBase.cpp
 2018-01-04 05:15:13 +01:00
Julien Valentin
0e76dc169e add more Extensions 2018-01-04 04:18:38 +01:00