Robert Osfield
9ec4da47f5
Fixed "Using invalid iterator" bug in getTile() methods, detected by Covertity.
2016-06-09 11:41:14 +01:00
Julien Valentin
ac26ba7e5b
Shader subroutine related funcs added
2016-06-09 10:48:05 +01:00
Sebastian Messerschmidt
7ccf16b83d
OpenFlight-plugin with extended attributes.
...
Added the addtional properties (terrain, roofline and footprint) alongside with the SMC/FID attributes. Also I added the newly added IRMaterial to the per-geode properties.
Added the Texture-EffectId and the mapping index as a user-value to the texture object.
Naming scheme is the same as for the per-vertex/geode attributes.
2016-06-09 10:15:38 +01:00
Laurens Voerman
09badeb19c
Merge remote-tracking branch 'upstream/master'
2016-06-08 16:16:48 +02:00
Laurens Voerman
075de21af1
visual studio 2015 warning fixes:
...
OpenSceneGraph\src\osgPlugins\dae\daeRAnimations.cpp(470): warning C4456: declaration of 'kfCntr' hides previous local declaration
OpenSceneGraph\src\osgPlugins\dae\daeRAnimations.cpp(452): note: see declaration of 'kfCntr'
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(202): warning C4456: declaration of 'i' hides previous local declaration
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(188): note: see declaration of 'i'
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(226): warning C4456: declaration of 'i' hides previous local declaration
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(188): note: see declaration of 'i'
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(243): warning C4456: declaration of 'i' hides previous local declaration
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(188): note: see declaration of 'i'
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(253): warning C4456: declaration of 'i' hides previous local declaration
OpenSceneGraph\src\osgPlugins\dae\daeReader.cpp(188): note: see declaration of 'i'
2016-06-08 14:22:14 +02:00
Robert Osfield
ae98593403
Fixed unused parameter warning.
2016-06-08 10:59:55 +01:00
Robert Osfield
7b7899154c
Fixed unused parameter warning.
2016-06-08 10:58:14 +01:00
Robert Osfield
801d41c47a
Fixed unused parameter warning.
2016-06-08 10:55:22 +01:00
Robert Osfield
f774a38cf2
Fixed unused parameter warning.
2016-06-08 10:52:40 +01:00
Robert Osfield
19ec9bbef6
Fixed unused parameter warning.
2016-06-08 10:51:45 +01:00
Robert Osfield
4e442f483f
Fixed unused parameter warning.
2016-06-08 10:46:45 +01:00
Robert Osfield
bc866c51de
Fixed unused parameter warning.
2016-06-08 10:45:32 +01:00
Robert Osfield
e23798d630
Fixed unused parameter warning.
2016-06-08 10:43:57 +01:00
Robert Osfield
1d37501262
Fixed unused parameter warning.
2016-06-08 10:42:00 +01:00
Robert Osfield
782e867a7c
Fixed unused parameter warning.
2016-06-08 10:34:40 +01:00
Robert Osfield
62f97923e0
Fixed unused parameter warning.
2016-06-08 10:19:57 +01:00
Robert Osfield
de80cac99f
Fixed -Wextra warnings
2016-06-08 10:18:23 +01:00
Robert Osfield
5bdd65c300
Fixed unused parameter warning.
2016-06-08 10:17:47 +01:00
Robert Osfield
883e195bba
Fixed unused parameter warning.
2016-06-08 10:16:20 +01:00
Robert Osfield
eae28e4d91
Fixed unused parameter warning.
2016-06-08 10:15:51 +01:00
Robert Osfield
4dfd655b0c
Fixed unused parameter warning.
2016-06-08 10:14:56 +01:00
Robert Osfield
b4900811a7
Fixed -Wextra warning
2016-06-08 10:00:18 +01:00
Robert Osfield
37e83f7c62
Disabled -Wextra for dae build as warnings in COLLADA_DOM headers can't be fixed
2016-06-08 09:59:33 +01:00
Robert Osfield
39a2d755db
Fixed -Wextra warning
2016-06-08 09:57:57 +01:00
Robert Osfield
8d4a976477
Fixed unused parameter warning.
2016-06-08 09:57:30 +01:00
Robert Osfield
3783061c2a
Fixed -Wextra warnings
2016-06-08 09:57:02 +01:00
Robert Osfield
f4078251be
Fixed -Wextra warning
2016-06-08 09:56:35 +01:00
Robert Osfield
4d3a549727
Fixed unused parameter warning.
2016-06-08 09:55:33 +01:00
Robert Osfield
1778b15a4d
Fixed unused parameter warning.
2016-06-08 09:55:15 +01:00
Robert Osfield
322cf0c39e
Fixed unused parameter warning.
2016-06-08 09:54:10 +01:00
Robert Osfield
e9b8069204
Fixed unused parameter warning.
2016-06-08 09:52:09 +01:00
Robert Osfield
bc7156cd26
Fixed unused parameter warning.
2016-06-08 09:51:50 +01:00
Robert Osfield
85a77f42a4
Fixed -Wextra warnings
2016-06-08 09:50:38 +01:00
Robert Osfield
bfd1d7c55b
Fixed unused parameter warning.
2016-06-08 09:49:58 +01:00
Robert Osfield
118411ba23
Fixed unused parameter warning.
2016-06-08 09:49:29 +01:00
Robert Osfield
1a093ca98d
Fixed unused parameter warning.
2016-06-08 09:49:10 +01:00
Robert Osfield
2acca80be8
Fixed unused parameter warning.
2016-06-08 09:48:39 +01:00
Robert Osfield
c7b64cb9a7
Fixed -Wextra warnings
2016-06-08 09:48:14 +01:00
Robert Osfield
0be6502711
Fixed unused parameter warning.
2016-06-08 09:47:30 +01:00
Robert Osfield
aef2574b8d
Fixed -Wextra warnings
2016-06-08 09:46:09 +01:00
Robert Osfield
7bb0f437c1
Fixed unused parameter warning.
2016-06-08 09:44:39 +01:00
Robert Osfield
b51c8bed46
Fixed unused parameter warnings
2016-06-08 09:43:40 +01:00
Robert Osfield
f213868673
Fixed unused parameter warning.
2016-06-08 09:43:05 +01:00
Robert Osfield
6f68915425
Fixed unused parameter warning.
2016-06-08 09:38:22 +01:00
Robert Osfield
2955fc8bb2
Disabled the -Wextra warnin the warnings that can't be fixed due to optional code paths.
2016-06-08 09:37:43 +01:00
Robert Osfield
1a3a851f6e
Fixed unused parameter warning.
2016-06-08 09:34:34 +01:00
Robert Osfield
d712784177
Disabled the -Wextra warning as resolve the warnings will create other warnings under other compilers
2016-06-08 09:33:56 +01:00
Robert Osfield
ef73d2449e
Fixed -Wextra warnings
2016-06-08 09:20:16 +01:00
Robert Osfield
8ba7998623
Fixed -Wextra warnings
2016-06-08 09:07:32 +01:00
Robert Osfield
a16c34208f
Fixed unused parameter warning.
2016-06-08 09:06:42 +01:00
