Changeset 82

Timestamp:

Mar 22, 2005, 2:12:17 PM (19 years ago)

Author:

darran

Message:

• unknown changes, likely to do with Picture in Picture testing.

Location:

Swollen

Files:

• doc/contract2_priorities.txt (modified) (5 diffs)
• swollen/keyboardeventhandler.cpp (modified) (1 diff)
• swollen/main.cpp (modified) (1 diff)
• swollen/version.cpp (modified) (1 diff)
• swwreader/swwreader.cpp (modified) (1 diff)

Swollen/doc/contract2_priorities.txt

@@ -35 +35 @@
 - Optional height-dependent semi-transparent water surface [0]
 - Interactive positioning of light(s) [0]
+
+  
+UNDER DEVELOPMENT:
+
 - Ability to have shading on bed-surface. This was the case with 
   distro31052004 and is very useful with large scale topographies. 
@@ -40 +44 @@
   both swwviewer and swollen and let Ole know what you think.
   Perhaps default to that standard background in the absence of bedslope.jpg
-  or perhaps tie in with the geotiff item by having such a default behaviour.
-
-
-  
-UNDER DEVELOPMENT:
-
+  or perhaps tie in with the geotiff item by having such a default behaviour. [5]
+- fix popping on shallow triangles [5]
 - use of geotiff in sww file [5]
 - Optional colour coding of water surface based on arbitrary fields 
@@ -51 +51 @@
 - Output coordinates defining camera position [?]
 - Ability to handle scenes with a resolution of 500,000+ triangles [3]
+- add back steep culling ability [4]
 
 
@@ -56 +57 @@
 BUG LIST
 
-- cairns dataset reveals popping triangles (zbuffer?)
+- culling
+- --help not working, -h giving an "abort trap"
 - steepcull dataset reveals steep angle cull problem
 - dragging sww onto swollen (all in one directory) does not produce the same results as 
@@ -62 +64 @@
 - Problems with Duncan's, Chris' and Stephen Roberts' machines at GA: Swollen won't render semi 
   transparency. Swwviewer works fine. (This appeared to work on Dunca's computer 13/12/4?).
-
+- with -scale, rotation seems unnatural (and initial position shifted vertically?)
 
 

Swollen/swollen/keyboardeventhandler.cpp

@@ -136 +136 @@
 }
 
-

Swollen/swollen/main.cpp

@@ -189 +189 @@
     // second camera
     Producer::ref_ptr<Producer::Camera> pcam1 = viewer.getCamera(0);
+    pcam1->setProjectionRectangle( 0.0f, 0.5f, 0.0f, 1.0f );
+
     Producer::Camera* pcam2 = new Producer::Camera();
-    pcam1->setProjectionRectangle( 0.0f, 0.75f, 0.0f, 1.0f );
-
     pcam2->setRenderSurface( pcam1->getRenderSurface() );
     pcam2->setProjectionRectangle( 0.76f, 1.0f, 0.0f, 0.25f );
     viewer.getCameraConfig()->addCamera( "pictureInPicture", pcam2 );
+
     osgProducer::OsgSceneHandler* sh = new osgProducer::OsgSceneHandler();
     sh->getSceneView()->setSceneData( rootnode );
     pcam2->setSceneHandler( sh );
 
-
-
+    
     unsigned int timestep = 0;
     while( !viewer.done() )

Swollen/swollen/version.cpp

@@ -1 @@
-const char* version() { const char* s = "Revision: 73M"; return s; }
+const char* version() { const char* s = "Revision: 76M"; return s; }

Swollen/swwreader/swwreader.cpp

@@ -133 +133 @@
 
     // default texture map without geodata
+    // FIXME: only use texture if specified on command line, otherwise colour
     _bedslopetexture = new std::string("bedslope.jpg");
     _bedslopegeodata.hasData = false;