Changeset 8196

Show
Ignore:
Timestamp:
04/23/08 18:23:11
Author:
robert
Message:

Various improvements to presentations

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/C++AndMemoryManagement/CppAndOpenSceneGraph.p3d

    r8159 r8196  
    88--> 
    99 
    10 <presentation> 
     10<presentation character_size="0.02">  
    1111<name>Siggraph Menu</name> 
    1212<textcolor>YELLOW</textcolor> 
    1313 
    14 <path>/home/robert/Presentations/Siggraph</path> 
     14 
     15  
     16<path>${DATA_DIR}</path> 
     17<path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     18<path>${DATA_DIR}/Images</path> 
     19<path>${DATA_DIR}/Models</path> 
     20<path>${DATA_DIR}/Earth</path> 
     21 
     22<title-settings character_size="0.04"></title-settings> 
     23<text-settings character_size="0.03"></text-settings> 
    1524 
    1625<template_slide name="front"> 
    …… 
    1928  <base> 
    2029     <click_to_event>Home</click_to_event>         
    21      <bullet character_size="0.025" position="0.5 0.02 0.05">Home</bullet> 
     30     <bullet character_size="0.02" position="0.5 0.02 0.05">Home</bullet> 
    2231     <click_to_event>Next</click_to_event>         
    23      <bullet character_size="0.025" position="0.9 0.02 0.05">Next</bullet> 
     32     <bullet character_size="0.02" position="0.9 0.02 0.05">Next</bullet> 
    2433  </base> 
    2534</template_slide> 
    …… 
    3039  <base> 
    3140     <click_to_event>Previous</click_to_event>         
    32      <bullet character_size="0.025" position="0.1 0.02 0.05">Previous</bullet> 
     41     <bullet character_size="0.02" position="0.1 0.02 0.05">Previous</bullet> 
    3342     <click_to_event>Home</click_to_event>         
    34      <bullet character_size="0.025" position="0.5 0.02 0.05">Home</bullet> 
     43     <bullet character_size="0.02" position="0.5 0.02 0.05">Home</bullet> 
    3544     <click_to_event>Next</click_to_event>         
    36      <bullet character_size="0.025" position="0.9 0.02 0.05">Next</bullet> 
     45     <bullet character_size="0.02" position="0.9 0.02 0.05">Next</bullet> 
    3746  </base> 
    3847</template_slide> 
    …… 
    4352  <base> 
    4453     <click_to_event>Previous</click_to_event>         
    45      <bullet character_size="0.025" position="0.1 0.02 0.05">Previous</bullet> 
     54     <bullet character_size="0.02" position="0.1 0.02 0.05">Previous</bullet> 
    4655     <click_to_event>Home</click_to_event>         
    47      <bullet character_size="0.025" position="0.5 0.02 0.05">Home</bullet> 
     56     <bullet character_size="0.02" position="0.5 0.02 0.05">Home</bullet> 
    4857  </base> 
    4958</template_slide> 

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/Introduction/BuildingOpenSceneGraph.p3d

    r8155 r8196  
    1212<textcolor>YELLOW</textcolor> 
    1313 
    14 <path>/home/robert/Presentations/Siggraph</path> 
     14<path>${DATA_DIR}</path> 
     15<path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     16<path>${DATA_DIR}/Images</path> 
     17<path>${DATA_DIR}/Models</path> 
     18<path>${DATA_DIR}/Earth</path> 
     19 
     20<title-settings character_size="0.04"></title-settings> 
     21<text-settings character_size="0.03"></text-settings> 
    1522 
    1623<template_slide name="front"> 
    …… 
    5865Distribution</paragraph> 
    5966<image fade="0 0.99 1 0.99" position="0.5 0.90 0" scale="0.55">Images/logops.rgb</image> 
    60 <image position="0.6 0.10 0.0" scale="0.55">Images/Cetma.jpg</image> 
    61 </layer> 
    62 </slide> 
    63  
    64 <slide inherit="middle"> 
    65 <bgcolor>WHITE</bgcolor> 
    66 <background></background> 
    67 <title> </title> 
    68 <layer> 
    69 <image position="0.5 0.5 0.01" scale="0.95">BuildingOpenSceneGraph.png</image> 
    7067</layer> 
    7168</slide> 

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/Introduction/OpenSceneGraphTour.p3d

    r8155 r8196  
    1010<presentation> 
    1111 
    12    <path>../Images</path> 
    13    <path>../Data</path> 
    14    <path>..</path> 
    15    <path>/home/robert/Data/WholeEarth</path> 
     12   <path>${DATA_DIR}</path> 
     13   <path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     14   <path>${DATA_DIR}/Images</path> 
     15   <path>${DATA_DIR}/Models</path> 
     16   <path>${DATA_DIR}/Earth</path> 
    1617 
    1718   <name>OpenSceneGraph History Tour</name> 

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/Introduction/theimpactofopensource.p3d

    r8194 r8196  
    1313   <env>OSG_NEAR_FAR_RATIO=0.00001</env> 
    1414    
     15   <path>${DATA_DIR}</path> 
     16   <path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     17   <path>${DATA_DIR}/Images</path> 
     18   <path>${DATA_DIR}/Models</path> 
     19   <path>${DATA_DIR}/Earth</path> 
     20 
    1521   <name>Role of Scene Graphs in VR</name> 
    1622   <bgcolor>BLACK</bgcolor> 
    1723   <textcolor>YELLOW</textcolor> 
    1824     
    19    <path>/home/robert/Presentations/Siggraph</path> 
    2025 
    2126   <holding_slide> 

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/Maths/MathsAndOpenSceneGraph.p3d

    r8162 r8196  
    99 
    1010<presentation> 
    11 <name>Siggraph Menu</name> 
     11 
     12<path>${DATA_DIR}</path> 
     13<path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     14<path>${DATA_DIR}/Images</path> 
     15<path>${DATA_DIR}/Models</path> 
     16<path>${DATA_DIR}/Earth</path> 
     17 
     18<title-settings character_size="0.05"></title-settings> 
     19<text-settings character_size="0.03.5"></text-settings> 
     20 
    1221<textcolor>YELLOW</textcolor> 
    13  
    14 <path>/home/robert/Presentations/Siggraph</path> 
    1522 
    1623<template_slide name="front"> 
    …… 
    6673 
    6774Float vector classes: 
    68  
     75  
    6976    osg::Vec2f, osg::Vec3f, osg::Vec4f 
    7077    osg::Vec*f::value_type == float 
    71  
    72     osg::Vec2, osg::Vec3, osg::Vec4  - typedef'd to Vec2f, Vec3f, Vec4f 
     78  
     79    osg::Vec2, osg::Vec3, osg::Vec4  - typedef'd to  
     80    Vec2f, Vec3f, Vec4f 
    7381 
    7482Double vectors classes: 
    75  
     83  
    7684    osg::Vec2d, osg::Vec3d, osg::Vec4d 
    7785    osg::Vec*d::value_type == double 
    …… 
    8189<page inherit="middle" title="Vec accessors"> 
    8290 
    83  
     91  
    8492   Vec4 v; 
    8593    
    …… 
    8896   v[2] == v.z() == v.b() 
    8997   v[3] == v.w() == v.a() 
    90  
    91     // to get raw data 
    92     float* ptr = v.ptr() 
     98  
     99   // to get raw data 
     100   float* ptr = v.ptr() 
    93101 
    94102</page> 
    …… 
    101109   v3 = v1 + v2; 
    102110   v3 += v1; 
    103  
     111  
    104112   // component wise subtraction 
    105113   v3 = v1 - v2; 
    106114   v3 -= v1; 
    107     
     115  
    108116   // scalar multiplication 
    109117   v3 = v3 * 10.0f;    
    110118   v3 *= 10.0f; 
    111  
     119  
    112120   // scalar division 
    113    v3 = v3 / 10.0f;    
     121   v3 = v3 / 10.0f; 
    114122   v3 /= 10.0f; 
    115123</page> 
    …… 
    118126 
    119127   osg::Vec4 v1, v2, v3; 
    120     
     128  
    121129   // dot product 
    122130   v3 = v1 * v2; 
    123     
     131  
    124132   // cross product 
    125133   v3 = v1 ^ v2; 
    126     
     134  
    127135   // length 
    128136   float len = v3.length(); 
    …… 
    149157 
    150158float 4x4 matrix: 
    151  
     159  
    152160  osg::Matrixf 
    153161  osg::Matrixf::value_type == float 
    154162   
    155163double 4x4 matrix: 
    156  
     164  
    157165  osg::Matrixd 
    158166  osg::matrixd::value_type == double 

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/NodeKits/osgFX.p3d

    r8175 r8196  
    1515   <duration>1.0</duration> 
    1616 
    17    <path>/home/robert/Presentations/Siggraph</path> 
     17   <path>${DATA_DIR}</path> 
     18   <path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     19   <path>${DATA_DIR}/Images</path> 
     20   <path>${DATA_DIR}/Models</path> 
     21   <path>${DATA_DIR}/Earth</path> 
    1822 
    1923   <slide> 

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/PagedDatabases/databasepaging.p3d

    r8194 r8196  
    22<presentation> 
    33 
    4      <env>OSG_COMPUTE_NEAR_FAR_MODE=COMPUTE_NEAR_FAR_USING_PRIMITIVES</env> 
    5      <env>OSG_NEAR_FAR_RATIO=0.00001</env> 
    6  
     4    <env>OSG_COMPUTE_NEAR_FAR_MODE=COMPUTE_NEAR_FAR_USING_PRIMITIVES</env> 
     5    <env>OSG_NEAR_FAR_RATIO=0.00001</env> 
     6 
     7    <path>${DATA_DIR}</path> 
     8    <path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     9    <path>${DATA_DIR}/Images</path> 
     10    <path>${DATA_DIR}/Models</path> 
     11    <path>${DATA_DIR}/Earth</path> 
    712 
    813    <name>Database Paging</name> 
    …… 
    1015    <textcolor>1.0 1.0 0.20 1.0</textcolor> 
    1116    <duration>1.0</duration> 
    12  
    13     <path>/home/robert/Presentations/Siggraph</path> 
    14     <path>/home/robert/Presentations/Opticore/Nellis</path> 
    1517 
    1618    <holding_slide> 

  • OpenSceneGraph-TrainingMaterials/trunk/Presentations/State/Multi-Pass.p3d

    r8167 r8196  
    66<textcolor>YELLOW</textcolor> 
    77 
    8 <path>/home/robert/Presentations/Siggraph</path> 
     8<path>${DATA_DIR}</path> 
     9<path>${DATA_DIR}/OpenSceneGraph-Data</path> 
     10<path>${DATA_DIR}/Images</path> 
     11<path>${DATA_DIR}/Models</path> 
     12<path>${DATA_DIR}/Earth</path> 
    913 
    1014<template_slide name="front">