Board index FlightGear Development Scenery

fgphotoscenery

Questions and discussion about enhancing and populating the FlightGear world.

Re: fgphotoscenery

Postby fgphotoscenery » Tue Mar 20, 2012 8:34 pm

please run the following
Code: Select all
./run_fgfs.sh --altitude=1200 --aircraft=ufo --lat=37.8209 --lon=-122.4676 --heading=-64 --timeofday=noon --log-level=info |& grep overlay

and check if you see
Code: Select all
  Adding overlay image 942066.dds
  Adding overlay image 942065.dds

on the console. If that's not the case, then the compilation had not worked (or the .dds images are not in the same directory as their btg.gz counterparts).
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

Re: fgphotoscenery

Postby nacho » Fri Mar 23, 2012 2:52 am

Can you also add to the ZIP file the btg.gz just in case?

I tried compiling once again, after modifing the files and also modifing certain parameters in the download.sh fie:

Here is my output and as you can see, no errors in the compilation.

Here is SIMGEAR:

Code: Select all
ibravo@Tinker:~/Games$ sh download_and_compile.19.sh -u SIMGEAR
**************************************
*                                    *
* Warning, the compilation process   *
* is going to use 9 or more Gbytes   *
* of space and at least a couple of  *
* hours to download and build FG.    *
*                                    *
* Please, be patient ......          *
*                                    *
**************************************
****************************************
**************** SIMGEAR ***************
****************************************
[  1%] Built target sgbucket
[  1%] Built target sgdebug
[  7%] Built target sgephem
[  9%] Built target sgtiming
[ 16%] Built target sgio
[ 21%] Built target sgmisc
[ 27%] Built target sgstructure
[ 27%] Built target sgthreads
[ 28%] Built target decode_binobj
[ 29%] Built target httpget
[ 29%] Built target test_binobj
[ 30%] Built target test_http
[ 31%] Built target test_sock
[ 32%] Built target sgmagvar
[ 32%] Built target test_magvar
[ 34%] Built target sgmath
[ 34%] Built target geometry_test
[ 34%] Built target math_test
[ 34%] Built target test_path
[ 34%] Built target test_strings
[ 35%] Built target test_tabbed_values
[ 43%] Built target sgnasal
[ 46%] Built target sgprops
[ 49%] Built target sgxml
[ 50%] Built target test_propertyObject
[ 50%] Built target test_props
[ 51%] Built target sgroute
[ 52%] Built target sgserial
[ 53%] Built target sgenvironment
[ 54%] Built target test_metar
[ 55%] Built target sgscreen
[ 61%] Built target sgbvh
[ 67%] Built target sgmaterial
[ 77%] Built target sgmodel
[ 82%] Built target sgsky
[ 82%] Built target BucketBoxTest
[ 88%] Built target sgtgdb
[ 95%] Built target sgutil
[ 96%] Built target sgtsync
[ 98%] Built target sgsound
[ 99%] Built target openal_test1
[ 99%] Built target openal_test2
[100%] Built target openal_test3
[100%] Built target openal_test4
[  1%] Built target sgbucket
[  1%] Built target sgdebug
[  7%] Built target sgephem
[  9%] Built target sgtiming
[ 16%] Built target sgio
[ 21%] Built target sgmisc
[ 27%] Built target sgstructure
[ 27%] Built target sgthreads
[ 28%] Built target decode_binobj
[ 29%] Built target httpget
[ 29%] Built target test_binobj
[ 30%] Built target test_http
[ 31%] Built target test_sock
[ 32%] Built target sgmagvar
[ 32%] Built target test_magvar
[ 34%] Built target sgmath
[ 34%] Built target geometry_test
[ 34%] Built target math_test
[ 34%] Built target test_path
[ 34%] Built target test_strings
[ 35%] Built target test_tabbed_values
[ 43%] Built target sgnasal
[ 46%] Built target sgprops
[ 49%] Built target sgxml
[ 50%] Built target test_propertyObject
[ 50%] Built target test_props
[ 51%] Built target sgroute
[ 52%] Built target sgserial
[ 53%] Built target sgenvironment
[ 54%] Built target test_metar
[ 55%] Built target sgscreen
[ 61%] Built target sgbvh
[ 67%] Built target sgmaterial
[ 77%] Built target sgmodel
[ 82%] Built target sgsky
[ 82%] Built target BucketBoxTest
[ 88%] Built target sgtgdb
[ 95%] Built target sgutil
[ 96%] Built target sgtsync
[ 98%] Built target sgsound
[ 99%] Built target openal_test1
[ 99%] Built target openal_test2
[100%] Built target openal_test3
[100%] Built target openal_test4
Install the project...
-- Install configuration: "Release"
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/simgear_config.h
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/compiler.h
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/constants.h
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/sg_inlines.h
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/version.h
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgbucket.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/bucket/newbucket.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgdebug.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/debug/debug_types.h
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/debug/logstream.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgephem.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/celestialBody.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/ephemeris.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/jupiter.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/mars.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/mercury.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/moonpos.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/neptune.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/pluto.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/saturn.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/star.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/stardata.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/uranus.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/ephemeris/venus.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgio.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/iochannel.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/lowlevel.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/raw_socket.hxx
-- Installing: /home/ibravo/Games/install/simgear/include/simgear/io/sg_binobj.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/sg_file.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/sg_netBuffer.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/sg_netChannel.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/sg_netChat.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/sg_serial.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/sg_socket.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/sg_socket_udp.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/HTTPClient.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/io/HTTPRequest.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgmagvar.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/magvar/magvar.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/magvar/coremag.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgmath.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGBox.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGCMath.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGGeoc.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGGeod.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGGeodesy.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGGeometry.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGGeometryFwd.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGIntersect.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGLimits.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGLineSegment.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGMath.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGMathFwd.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGMatrix.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGMisc.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGPlane.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGQuat.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGRay.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGSphere.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGTriangle.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGVec2.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGVec3.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/SGVec4.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/beziercurve.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/interpolater.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/leastsqs.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/sg_geodesy.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/sg_types.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/math/sg_random.h
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgmisc.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/ResourceManager.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/interpolator.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/sg_dir.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/sg_path.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/sgstream.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/stdint.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/stopwatch.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/strutils.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/tabbed_values.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/texcoord.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/misc/zfstream.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgnasal.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/nasal/naref.h
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/nasal/nasal.h
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgprops.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/AtomicChangeListener.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/ExtendedPropertyAdapter.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/condition.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/propertyObject.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/props.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/props_io.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/propsfwd.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/props/tiedpropertylist.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgroute.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/route/route.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/route/waypoint.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgserial.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/serial/serial.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgstructure.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/OSGUtils.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/OSGVersion.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGAtomic.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGBinding.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGExpression.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGReferenced.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGSharedPtr.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGSmplhist.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGSmplstat.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGWeakPtr.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGWeakReferenced.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/SGPerfMon.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/singleton.hpp
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/Singleton.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/StringTable.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/callback.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/commands.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/event_mgr.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/exception.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/intern.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/structure/subsystem_mgr.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgthreads.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/threads/SGGuard.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/threads/SGQueue.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/threads/SGThread.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgtiming.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/timing/sg_time.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/timing/timestamp.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/timing/timezone.h
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/timing/lowleveltime.h
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgxml.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/xml/easyxml.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgenvironment.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/environment/metar.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/environment/precipitation.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgscreen.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/screen/colors.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/screen/extensions.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/screen/screen-dump.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/screen/tr.h
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgbvh.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHBoundingBoxVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHDebugCollectVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHGroup.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHLineGeometry.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHLineSegmentVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHMotionTransform.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHNearestPointVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHNode.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHStaticBinary.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHStaticData.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHStaticGeometry.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHStaticGeometryBuilder.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHStaticLeaf.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHStaticNode.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHStaticTriangle.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHSubTreeCollector.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHTransform.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/bvh/BVHVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgmaterial.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/Effect.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/EffectBuilder.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/EffectCullVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/EffectGeode.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/GLPredicate.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/Pass.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/Technique.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/TextureBuilder.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/mat.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/matlib.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/matmodel.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/material/mipmap.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgmodel.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/BoundingVolumeBuildVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/CheckSceneryVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/ConditionNode.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/ModelRegistry.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGClipGroup.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGInteractionAnimation.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGMaterialAnimation.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGOffsetTransform.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGReaderWriterXML.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGRotateTransform.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGScaleTransform.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGText.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/SGTranslateTransform.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/animation.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/model.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/modellib.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/particles.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/persparam.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/model/placement.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgsky.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/CloudShaderGeometry.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/cloud.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/cloudfield.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/dome.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/moon.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/newcloud.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/oursun.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/sky.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/sphere.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/sky/stars.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgtgdb.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/GroundLightManager.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/ReaderWriterSPT.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/ReaderWriterSTG.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGDirectionalLightBin.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGLightBin.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGModelBin.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGOceanTile.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGReaderWriterBTG.hxx
-- Installing: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGTriangleBin.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGVasiDrawable.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGVertexArrayBin.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/ShaderGeometry.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/TreeBin.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/apt_signs.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/obj.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/pt_lights.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/userdata.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgutil.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/CopyOp.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/NodeAndDrawableVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/Noise.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/OsgMath.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/OsgSingleton.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/PrimitiveUtils.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/QuadTreeBuilder.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/RenderConstants.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGDebugDrawCallback.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGEnlargeBoundingBox.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGNodeMasks.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGPickCallback.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGReaderWriterOptions.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGSceneFeatures.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGSceneUserData.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGStateAttributeVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGTextureStateAttributeVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SGUpdateVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/SplicingVisitor.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/StateAttributeFactory.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/UpdateOnceCallback.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/VectorArrayAdapter.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/util/project.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgtsync.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/scene/tsync/terrasync.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/lib/libsgsound.a
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/sound/sample_group.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/sound/sample_openal.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/sound/sample_queue.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/sound/soundmgr_openal.hxx
-- Up-to-date: /home/ibravo/Games/install/simgear/include/simgear/sound/xmlsound.hxx
/home/ibravo/Games
To start fgfs, run the run_fgfs.sh file
To start terrasync, run the run_terrasync.sh file
To start fgrun, run the run_fgrun.sh file
To start fgcom, run the run_fgcom.sh file
To start fgcom GUI, run the run_fgcomgui.sh file
To start atlas, run the run_atlas.sh file
Usage: download_and_compile.19.sh -h
for help
ibravo@Tinker:~/Games$


There were two instalations there:

-- Installing: /home/ibravo/Games/install/simgear/include/simgear/io/sg_binobj.hxx
-- Installing: /home/ibravo/Games/install/simgear/include/simgear/scene/tgdb/SGTexturedTriangleBin.hxx


And after compiling FGFS:

Code: Select all
 sh download_and_compile.19.sh -u FGFS
**************************************
*                                    *
* Warning, the compilation process   *
* is going to use 9 or more Gbytes   *
* of space and at least a couple of  *
* hours to download and build FG.    *
*                                    *
* Please, be patient ......          *
*                                    *
**************************************
****************************************
**************** FGFS ******************
****************************************
[  4%] Built target fgAirports
[  5%] Built target fgAircraft
[  6%] Built target fgATC
[  7%] Built target fgATCDCL
[  8%] Built target fgRadio
[ 11%] Built target fgAutopilot
[ 12%] Built target fgCockpit
[ 16%] Built target fgEnvironment
[ 20%] Built target fgGUI
[ 22%] Built target fgInput
Linking CXX executable fgjs
[ 23%] Built target fgjs
Linking CXX executable js_demo
[ 24%] Built target js_demo
[ 40%] Built target fgInstruments
[ 41%] Built target fgModel
[ 41%] Built target fgMultiPlayer
[ 47%] Built target fgAIModel
[ 50%] Built target fgNavaids
[ 57%] Built target fgNetwork
[ 58%] Built target fgScenery
[ 59%] Built target fgScripting
[ 61%] Built target fgSound
[ 62%] Built target fgSystems
[ 63%] Built target fgTime
[ 63%] Built target fgTraffic
[ 65%] Built target fgFDM
[ 72%] Built target fgYASim
Linking CXX executable yasim
[ 73%] Built target yasim
[ 92%] Built target fgJSBSim
Scanning dependencies of target fgfs
[ 92%] Building CXX object src/Main/CMakeFiles/fgfs.dir/options.cxx.o
Linking CXX executable fgfs
[ 97%] Built target fgfs
Linking CXX executable metar
[ 97%] Built target metar
Linking CXX executable terrasync
[ 97%] Built target terrasync
Linking CXX executable fgviewer
[ 97%] Built target fgviewer
Linking CXX executable GPSsmooth
[ 98%] Built target GPSsmooth
Linking CXX executable MIDGsmooth
[ 98%] Built target MIDGsmooth
Linking CXX executable UGsmooth
[ 99%] Built target UGsmooth
[ 99%] Built target FGAdminUI
Linking CXX executable fgadmin
[100%] Built target fgadmin
[  4%] Built target fgAirports
[  5%] Built target fgAircraft
[  6%] Built target fgATC
[  7%] Built target fgATCDCL
[  8%] Built target fgRadio
[ 11%] Built target fgAutopilot
[ 12%] Built target fgCockpit
[ 16%] Built target fgEnvironment
[ 20%] Built target fgGUI
[ 22%] Built target fgInput
[ 23%] Built target fgjs
[ 24%] Built target js_demo
[ 40%] Built target fgInstruments
[ 41%] Built target fgModel
[ 41%] Built target fgMultiPlayer
[ 47%] Built target fgAIModel
[ 50%] Built target fgNavaids
[ 57%] Built target fgNetwork
[ 58%] Built target fgScenery
[ 59%] Built target fgScripting
[ 61%] Built target fgSound
[ 62%] Built target fgSystems
[ 63%] Built target fgTime
[ 63%] Built target fgTraffic
[ 65%] Built target fgFDM
[ 72%] Built target fgYASim
[ 73%] Built target yasim
[ 92%] Built target fgJSBSim
[ 97%] Built target fgfs
[ 97%] Built target metar
[ 97%] Built target terrasync
[ 97%] Built target fgviewer
[ 98%] Built target GPSsmooth
[ 98%] Built target MIDGsmooth
[ 99%] Built target UGsmooth
[ 99%] Built target FGAdminUI
[100%] Built target fgadmin
Install the project...
-- Install configuration: "Release"
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/doc/FlightGear/README
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/doc/FlightGear/README.OpenAL
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/doc/FlightGear/README.plib
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/doc/FlightGear/README.OSG
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/doc/FlightGear/README.SimGear
-- Installing: /home/ibravo/Games/install/fgfs/bin/fgjs
-- Installing: /home/ibravo/Games/install/fgfs/bin/js_demo
-- Installing: /home/ibravo/Games/install/fgfs/bin/yasim
-- Installing: /home/ibravo/Games/install/fgfs/bin/fgfs
-- Removed runtime path from "/home/ibravo/Games/install/fgfs/bin/fgfs"
-- Installing: /home/ibravo/Games/install/fgfs/bin/metar
-- Installing: /home/ibravo/Games/install/fgfs/bin/terrasync
-- Installing: /home/ibravo/Games/install/fgfs/bin/fgviewer
-- Removed runtime path from "/home/ibravo/Games/install/fgfs/bin/fgviewer"
-- Installing: /home/ibravo/Games/install/fgfs/bin/GPSsmooth
-- Installing: /home/ibravo/Games/install/fgfs/bin/MIDGsmooth
-- Installing: /home/ibravo/Games/install/fgfs/bin/UGsmooth
-- Installing: /home/ibravo/Games/install/fgfs/bin/fgadmin
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/man/man1/fgfs.1
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/man/man1/fgjs.1
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/man/man1/fgpanel.1
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/man/man1/gl-info.1
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/man/man1/js_demo.1
-- Up-to-date: /home/ibravo/Games/install/fgfs/share/man/man1/terrasync.1
To start fgfs, run the run_fgfs.sh file
To start terrasync, run the run_terrasync.sh file
To start fgrun, run the run_fgrun.sh file
To start fgcom, run the run_fgcom.sh file
To start fgcom GUI, run the run_fgcomgui.sh file
To start atlas, run the run_atlas.sh file
Usage: download_and_compile.19.sh -h
for help
ibravo@Tinker:~/Games$




And no overlay in the output

Code: Select all
ibravo@Tinker:~/Games$ ./run_fgfs.sh --altitude=1200 --aircraft=ufo --lat=37.8209 --lon=-122.4676 --heading=-64 --timeofday=noon --log-level=info |& grep overlay
ibravo@Tinker:~/Games$


At least this is better than when I tried patching the files, due to the errors that I was getting. Here I don't see any errors.
Just to be sure, here is where I included the files:

My 'Games' directory has the download_and_compile.sh file and I modified the following:
Games/install/fgfs/fgdata/Shaders and /Effects and
Games/simgear/simgear/simgear/io & /scene

Thanks for your help on this!
IB
nacho
 
Posts: 14
Joined: Mon Jan 23, 2012 2:25 am
Version: 2.8
OS: Ubuntu

Re: fgphotoscenery

Postby fgphotoscenery » Fri Mar 23, 2012 8:33 am

I am sorry that you are having so much trouble. I tried again with download_and_compile.sh and could not get the patch to compile into the code either despite having choosen what I thought were the right command-line options. Although it takes a lot of time, maybe it would be best, if you could try with makefg.

Code: Select all
wget http://geoffair.net/fg/zips/makefg-1.3.8.zip
unzip makefg-1.3.8.zip
echo "Press y everytime when asked. Wait a very long time"
makefg-1.3.8 FGRUNNO

wget http://fgphotoscenery.square7.ch/flightgear_photoscenery_2.7.0.zip
unzip flightgear_photoscenery_2.7.0.zip
echo "Press y everytime when asked."
makefg-1.3.8 FGRUNNO NOPAUSE

cd fgdata/Scenery
wget http://fgphotoscenery.square7.ch/fgphotoscenery_installation.zip
unzip fgphotoscenery_installation.zip
wget http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Scenery-v2.6.0/w130n30.tgz
tar -xzvf w130n30.tgz
cd ../../
echo "Checking if all files are there"
ls fgdata/Scenery/Terrain/w130n30/w123n37

./run_fgfs.sh --altitude=1200 --aircraft=ufo --lat=37.8209 --lon=-122.4676 --heading=-64 --timeofday=noon --log-level=info |& grep overlay
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

Re: fgphotoscenery

Postby marco » Mon Mar 26, 2012 3:15 pm

Hello,

finally i've got it working for me. I use opensuse 12.1 and the current git-version and cmake. Having copied the patched files into their correct location and having done a recompilation of both simgear and flightgear it worked perfectly.

cheers Marco
marco
 
Posts: 69
Joined: Sat Feb 12, 2011 11:09 pm
Location: EDDR
Version: Git
OS: openSuSE 13.2

Re: fgphotoscenery

Postby fgphotoscenery » Tue Mar 27, 2012 4:15 pm

thanks for the report! The installation instructions on http://fgphotoscenery.square7.ch have been updated and a small troubleshooting section has been added.
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

Re: fgphotoscenery

Postby Gijs » Sat May 05, 2012 3:39 pm

Hm, I seem to be unable to build the patch with current FGdata and Simgear/FlightGear. FlightGear fails to load whenever there is terrain in the scene. When I start at a location that I don't have scenery for (so just ocean), it loads fine.

Could anyone try building with current git?
Airports: EHAM, EHLE, KSFO
Aircraft: 747-400
User avatar
Gijs
Moderator
 
Posts: 9544
Joined: Tue Jul 03, 2007 3:55 pm
Location: Delft, the Netherlands
Callsign: PH-GYS
Version: Git
OS: Windows 10

Re: fgphotoscenery

Postby Hooray » Sat May 05, 2012 3:59 pm

Gijs wrote in Sat May 05, 2012 3:39 pm:Hm, I seem to be unable to build the patch with current FGdata and Simgear/FlightGear. FlightGear fails to load whenever there is terrain in the scene. When I start at a location that I don't have scenery for (so just ocean), it loads fine.

Could anyone try building with current git?


I don't understand, you said it would fail building for you, but then you say that the compiled binary fails to load scenery properly?
Either the build produces a binary (buggy or not): then the patch compiles fine, or it doesn't - which means, that you cannot run said binary?
Please don't send support requests by PM, instead post your questions on the forum so that all users can contribute and benefit
Thanks & all the best,
Hooray
Help write next month's newsletter !
pui2canvas | MapStructure | Canvas Development | Programming resources
Hooray
 
Posts: 12707
Joined: Tue Mar 25, 2008 9:40 am
Pronouns: THOU

Re: fgphotoscenery

Postby Gijs » Sat May 05, 2012 4:04 pm

Eh yeah, I've been trying all kind of builds during the past 5 hours, so I got a little confused :)

The build finally succeeded. But FlightGear was unable to launch when it had to load scenery. There was no error/warning in the console (tried various log levels). It did say that terrain was loaded and sometimes I was even able to see the terrain for a millisecond, before FG crashed...

It would be really nice if someone could give it a try. Then I at least know whether it just doesn't work anymore, or if it is my fault.
Airports: EHAM, EHLE, KSFO
Aircraft: 747-400
User avatar
Gijs
Moderator
 
Posts: 9544
Joined: Tue Jul 03, 2007 3:55 pm
Location: Delft, the Netherlands
Callsign: PH-GYS
Version: Git
OS: Windows 10

Re: fgphotoscenery

Postby dvanmosselbeen » Mon May 07, 2012 10:30 am

Hi Gijs,
Got it patched and compiled on Windows here.

The (new) simgear diff (git diff >> simgear_Brest_patch.diff)) within the simgear dir:

Code: Select all
diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx
index d594113..07102fe 100644
--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -90,6 +90,7 @@ private:
     std::vector<SGVec4f> colors;   // color list
     std::vector<SGVec3f> normals;   // normal list
     std::vector<SGVec2f> texcoords;   // texture coordinate list
+    std::vector<SGVec2f> overlaycoords;   // overlay texture coordinate list
 
     group_list pts_v;      // points vertex index
     group_list pts_n;      // points normal index
@@ -156,6 +157,9 @@ public:
     
     inline const std::vector<SGVec2f>& get_texcoords() const { return texcoords; }
     inline void set_texcoords( const std::vector<SGVec2f>& t ) { texcoords = t; }
+
+    inline const std::vector<SGVec2f>& get_overlaycoords() const { return overlaycoords; }
+    inline void set_overlaycoords( const std::vector<SGVec2f>& t ) { overlaycoords = t; }
     
     inline const group_list& get_pts_v() const { return pts_v; }
     inline void set_pts_v( const group_list& g ) { pts_v = g; }
diff --git a/simgear/scene/tgdb/SGTexturedTriangleBin.hxx b/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
index 5de1b5c..02f7272 100644
--- a/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
+++ b/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
@@ -37,8 +37,8 @@
 struct SGVertNormTex {
   SGVertNormTex()
   { }
-  SGVertNormTex(const SGVec3f& v, const SGVec3f& n, const SGVec2f& t) :
-    vertex(v), normal(n), texCoord(t)
+  SGVertNormTex(const SGVec3f& v, const SGVec3f& n, const SGVec2f& t, const SGVec2f& o) :
+    vertex(v), normal(n), texCoord(t), overlayCoord(o)
   { }
   struct less
   {
@@ -56,6 +56,7 @@ struct SGVertNormTex {
   SGVec3f vertex;
   SGVec3f normal;
   SGVec2f texCoord;
+  SGVec2f overlayCoord;
 };
 
 // Use a DrawElementsUShort if there are few enough vertices,
@@ -311,6 +312,7 @@ public:
     osg::Vec3Array* vertices = new osg::Vec3Array;
     osg::Vec3Array* normals = new osg::Vec3Array;
     osg::Vec2Array* texCoords = new osg::Vec2Array;
+    osg::Vec2Array* overlayCoords = new osg::Vec2Array;
 
     osg::Vec4Array* colors = new osg::Vec4Array;
     colors->push_back(osg::Vec4(1, 1, 1, 1));
@@ -322,6 +324,7 @@ public:
     geometry->setColorArray(colors);
     geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
     geometry->setTexCoordArray(0, texCoords);
+    geometry->setTexCoordArray(3, overlayCoords);
 
     const unsigned invalid = ~unsigned(0);
     std::vector<unsigned> indexMap(getNumVertices(), invalid);
@@ -334,6 +337,7 @@ public:
         vertices->push_back(toOsg(getVertex(triangle[0]).vertex));
         normals->push_back(toOsg(getVertex(triangle[0]).normal));
         texCoords->push_back(toOsg(getVertex(triangle[0]).texCoord));
+        overlayCoords->push_back(toOsg(getVertex(triangle[0]).overlayCoord));
       }
       deFacade.push_back(indexMap[triangle[0]]);
 
@@ -342,6 +346,7 @@ public:
         vertices->push_back(toOsg(getVertex(triangle[1]).vertex));
         normals->push_back(toOsg(getVertex(triangle[1]).normal));
         texCoords->push_back(toOsg(getVertex(triangle[1]).texCoord));
+        overlayCoords->push_back(toOsg(getVertex(triangle[1]).overlayCoord));
       }
       deFacade.push_back(indexMap[triangle[1]]);
 
@@ -350,6 +355,7 @@ public:
         vertices->push_back(toOsg(getVertex(triangle[2]).vertex));
         normals->push_back(toOsg(getVertex(triangle[2]).normal));
         texCoords->push_back(toOsg(getVertex(triangle[2]).texCoord));
+        overlayCoords->push_back(toOsg(getVertex(triangle[2]).overlayCoord));
       }
       deFacade.push_back(indexMap[triangle[2]]);
     }
diff --git a/simgear/scene/tgdb/obj.cxx b/simgear/scene/tgdb/obj.cxx
index 08606a0..63ff7fa 100644
--- a/simgear/scene/tgdb/obj.cxx
+++ b/simgear/scene/tgdb/obj.cxx
@@ -40,6 +40,12 @@
 #include <osg/StateSet>
 #include <osg/Switch>
 
+#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+#include <osgDB/ReadFile>
+#include <osg/Texture2D>
+#include <osg/TexEnv>
+
 #include <boost/foreach.hpp>
 
 #include <algorithm>
@@ -57,6 +63,7 @@
 #include <simgear/scene/util/SGUpdateVisitor.hxx>
 #include <simgear/scene/util/SGNodeMasks.hxx>
 #include <simgear/scene/util/QuadTreeBuilder.hxx>
+#include <simgear/bucket/newbucket.hxx>
 
 #include "SGTexturedTriangleBin.hxx"
 #include "SGLightBin.hxx"
@@ -279,6 +286,7 @@ struct SGTileGeometryBin {
                  const std::vector<SGVec3d>& vertices,
                  const std::vector<SGVec3f>& normals,
                  const std::vector<SGVec2f>& texCoords,
+                 const std::vector<SGVec2f>& overlayCoords,
                  const int_list& fans_v,
                  const int_list& fans_n,
                  const int_list& fans_tc,
@@ -288,8 +296,9 @@ struct SGTileGeometryBin {
       // If the normal indices do not match, they should be implicitly
       // the same than the vertex indices. So just call ourselves again
       // with the matching index vector.
-      addFanGeometry(triangles, vertices, normals, texCoords,
+      addFanGeometry(triangles, vertices, normals, texCoords, overlayCoords,
                      fans_v, fans_v, fans_tc, tcScale);
+
       return;
     }
 
@@ -297,15 +306,18 @@ struct SGTileGeometryBin {
     v0.vertex = toVec3f(vertices[fans_v[0]]);
     v0.normal = normals[fans_n[0]];
     v0.texCoord = getTexCoord(texCoords, fans_tc, tcScale, 0);
+    v0.overlayCoord = overlayCoords[fans_v[0]];
     SGVertNormTex v1;
     v1.vertex = toVec3f(vertices[fans_v[1]]);
     v1.normal = normals[fans_n[1]];
     v1.texCoord = getTexCoord(texCoords, fans_tc, tcScale, 1);
+    v1.overlayCoord = overlayCoords[fans_v[1]];
     for (unsigned i = 2; i < fans_v.size(); ++i) {
       SGVertNormTex v2;
       v2.vertex = toVec3f(vertices[fans_v[i]]);
       v2.normal = normals[fans_n[i]];
       v2.texCoord = getTexCoord(texCoords, fans_tc, tcScale, i);
+      v2.overlayCoord = overlayCoords[fans_v[i]];
       triangles.insert(v0, v1, v2);
       v1 = v2;
     }
@@ -369,9 +381,10 @@ struct SGTileGeometryBin {
       SGVec2f tcScale = getTexCoordScale(materialName, matlib);
       addFanGeometry(materialTriangleMap[materialName],
                      obj.get_wgs84_nodes(), obj.get_normals(),
-                     obj.get_texcoords(), obj.get_fans_v()[grp],
-                     obj.get_fans_n()[grp], obj.get_fans_tc()[grp],
-                     tcScale);
+                     obj.get_texcoords(), obj.get_overlaycoords(),
+                     obj.get_fans_v()[grp], obj.get_fans_n()[grp],
+                     obj.get_fans_tc()[grp], tcScale);
+
     }
     return true;
   }
@@ -929,12 +942,28 @@ SGLoadBTG(const std::string& path, const simgear::SGReaderWriterOptions* options
   SGGeod geodPos = SGGeod::fromCart(center);
   SGQuatd hlOr = SGQuatd::fromLonLat(geodPos)*SGQuatd::fromEulerDeg(0, 0, 180);
 
+  // Create bucket based on tile name to get the extent
+  long index = strtol(osgDB::getSimpleFileName(osgDB::getNameLessExtension(path)).c_str(), NULL, 10);
+  SGBucket b(index);
+  double lon_min = b.get_center_lon() - 0.5 * b.get_width();
+  double lat_max = b.get_center_lat() + 0.5 * b.get_height();
+
+  // Overlay texture coordinates
+  std::vector<SGVec2f> oc;
+
   // rotate the tiles so that the bounding boxes get nearly axis aligned.
   // this will help the collision tree's bounding boxes a bit ...
   std::vector<SGVec3d> nodes = tile.get_wgs84_nodes();
-  for (unsigned i = 0; i < nodes.size(); ++i)
+  for (unsigned i = 0; i < nodes.size(); ++i) {
+    // Generate TexCoords for Overlay
+    SGGeod node_deg = SGGeod::fromCart(nodes[i] + center);
+    float x = (node_deg.getLongitudeDeg() - lon_min) / b.get_width();
+    float y = (lat_max - node_deg.getLatitudeDeg()) / b.get_height();
+    oc.push_back(SGVec2f(x, y));
     nodes[i] = hlOr.transform(nodes[i]);
+  }
   tile.set_wgs84_nodes(nodes);
+  tile.set_overlaycoords(oc);
 
   SGQuatf hlOrf(hlOr[0], hlOr[1], hlOr[2], hlOr[3]);
   std::vector<SGVec3f> normals = tile.get_normals();
@@ -956,8 +985,28 @@ SGLoadBTG(const std::string& path, const simgear::SGReaderWriterOptions* options
   osg::Group* terrainGroup = new osg::Group;
 
   osg::Node* node = tileGeometryBin.getSurfaceGeometry(matlib);
-  if (node)
+  if (node) {
+    std::string overlayFile = osgDB::getNameLessExtension(path) + ".dds";
+    if (osgDB::fileExists(overlayFile)) {
+      // Get base node stateset
+      osg::ref_ptr<osg::StateSet> stateSet = node->getOrCreateStateSet();
+
+      // Load and set overlay texture
+      osg::ref_ptr<osg::Image> overlayImage = osgDB::readImageFile(overlayFile);
+      osg::ref_ptr<osg::Texture2D> overlayTexture = new osg::Texture2D;
+      overlayTexture->setImage(overlayImage.get());
+      stateSet->setTextureAttributeAndModes(3, overlayTexture.get(), osg::StateAttribute::ON);
+
+      // Apply the texture based on the overlay alpha channel
+      // *** Problem is we loose lighting
+      osg::ref_ptr<osg::TexEnv> overlayTexEnv = new osg::TexEnv(osg::TexEnv::DECAL);
+      stateSet->setTextureAttributeAndModes(3, overlayTexEnv.get(), osg::StateAttribute::ON);
+
+      SG_LOG(SG_TERRAIN, SG_INFO,
+             "  Adding overlay image " << osgDB::getSimpleFileName(overlayFile));
+    }
     terrainGroup->addChild(node);
+  }
 
   if (use_random_objects && matlib) {
     tileGeometryBin.computeRandomObjects(matlib);


Then i copied the Brest directory (see my mirrored file which contains all dds images) to the fgdata/Textures directory. (You should end up with a dir/file structure of fgdata/Textures/Brest/*.dds).

Then, like noted in Readme.txt of the Best package, i have added a few stuff to the "materials.xml" file (in the fgdata\Materials\dds\materials.xml as i'm using the dds textures instead of the default png. But fgdata\Materials\default\materials.xml should also work i guess)

Then add dds-Brest\data\Scenery (see Brest archieve) to your --fg-scenery
Ofcourse, you will miss the awesome models wich are available for that region in terrasync (thanks stupid #!@&$ç% changes...)

Finally start up FlightGear at LFRB :)

The good news is that it now seems to be fully compaible with the shaders. No need to disable them al now. And i didn't apllied that shader patch to fgdata. So you still have your fancy 3D clouds etc :D
But it seems that we can't use dds images to replace these <tile_id>.btg.gz like it was possible to do at some point. But i need to ivestigate futher more.
Regards,
Itchi
Proud to work on Belgian sceneries: https://github.com/dvanmosselbeen and the Rans S-6S aircraft: https://github.com/dvanmosselbeen/Rans-S-6S
dvanmosselbeen
 
Posts: 68
Joined: Sat Feb 26, 2011 3:54 pm
Location: Brussel
Callsign: B-ITCH
IRC name: dvanmosselbeen
Version: git
OS: Debian / Windwoss

Re: fgphotoscenery

Postby fgphotoscenery » Mon May 07, 2012 12:54 pm

Hi Itchi,

great news that a modified patch does work with the newest version of git! Also great news, that this does seem to work with all the shaders and that a modification of terrain-default.eff is not necessary!

Which patches have you been starting off? The latest ones did not require the change in materials.xml, so maybe you have been using the previous ones? Maybe that's why you got it working? In that case you can't use the textures from Benoit's new textures http://blaniel.free.fr/pub/flightgear/brest or from http://fgphotoscenery.square7.ch, can you? Does the
Code: Select all
debug.dump(geodinfo(getprop("position/latitude-deg"), getprop("position/longitude-deg")));

in Nasal deliver a list of landclasses?

If it was possible to combine the two worlds: using the new textures sitting next to the btg.gz files, not requiring the modification of materials.xml and allowing to get the landclass information together with not having to break the shaders, that would be really neat.

Peter
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

Re: fgphotoscenery

Postby fgphotoscenery » Wed May 09, 2012 7:11 am

Gijs,

removing the simgear and flightgear directories, patching and recompiling with makefg-1.3.9 worked for me and I can still see the photo scenery (I did not do amything to my existing fgdata). The first time I ran it, however, I also got a crash. Strange. The simgear files have changed a lot recently, so I definitely will have to go back and offer patches instead of full files.

Peter
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

Re: fgphotoscenery

Postby dvanmosselbeen » Fri May 11, 2012 11:22 am

Hi Peter,
I can confirm both methods work (materials.xml way and *.dds alongside the .stg). Firstly made a stupid user error on my first test. I used the patch from http://blaniel.free.fr/pub/flightgear/brest and slightly adjusted to match current simgear (didn't changed code except adding a #include <simgear/bucket/newbucket.hxx>)

However, on your website, the donloads always stop at some random size.

Kind regards,
David
Proud to work on Belgian sceneries: https://github.com/dvanmosselbeen and the Rans S-6S aircraft: https://github.com/dvanmosselbeen/Rans-S-6S
dvanmosselbeen
 
Posts: 68
Joined: Sat Feb 26, 2011 3:54 pm
Location: Brussel
Callsign: B-ITCH
IRC name: dvanmosselbeen
Version: git
OS: Debian / Windwoss

Re: fgphotoscenery

Postby fgphotoscenery » Sat May 12, 2012 7:45 pm

I can confirm both methods work (materials.xml way and *.dds alongside the .stg).

Great news, thanks for testing!

However, on your website, the donloads always stop at some random size.

That is really bad. In a test I just made, I got the exact same result! Not good at all but given that the web hosting is provided for free, I can not do much about it.

The only workaround I know of is to use some kind of download manager that allows to resume interrupted downloads. This can be
Code: Select all
wget -c http://fgphotoscenery.square7.ch/packages/fgphotoscenery_package_02.zip
(wget for windows) or something more sophisticated. I just checked that the server indeed does support resuming of downloads. Please let me know if that works for you.

Peter
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

Re: fgphotoscenery

Postby fgphotoscenery » Mon Nov 05, 2012 10:23 am

A new patch and new installation instructions for the current git version are now available on http://fgphotoscenery.square7.ch.

Peter
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

Re: fgphotoscenery

Postby fgphotoscenery » Mon Nov 12, 2012 11:41 pm

Hi all,

photo scenery for Glacier NP, Yellowstone NP, Great Teton NP and the Washington DC area has been added. The first post of this thread has been edited accordingly.

Peter
fgphotoscenery
 
Posts: 27
Joined: Tue Jan 31, 2012 7:43 am
OS: Ubuntu

PreviousNext

Return to Scenery

Who is online

Users browsing this forum: No registered users and 9 guests