Quellcode durchsuchen

- Continue the design of the new scene

Panagiotis Christopoulos Charitos vor 14 Jahren
Ursprung
Commit
dec85b9879
2 geänderte Dateien mit 31 neuen und 14 gelöschten Zeilen
  1. 11 0
      docs/drafts/scene-abstraction.txt
  2. 20 14
      docs/drafts/scene2.xmi

+ 11 - 0
docs/drafts/scene-abstraction.txt

@@ -150,6 +150,17 @@ Real flow:
 		endfor
 		
 	endfunction
+	
+	
+- Find all the octree nodes that are inside the frustum
+- Norrow down them using the Renderer and other tests
+- For all those octree nodes get the scene nodes
+- Resolve buckets
+- Finaly call SceneNode::visibleUpdate() for all visibles
+
+Method declaration: void performVisibilityTests(const Octree&, const Frustum&, const Renderer&);
+
+The Renderer is for hardware occlusion queries
 
 =========
 Rendering

+ 20 - 14
docs/drafts/scene2.xmi

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMI verified="false" xmi.version="1.2" timestamp="2011-11-07T19:14:16" xmlns:UML="http://schema.omg.org/spec/UML/1.3" >
+<XMI verified="false" xmi.version="1.2" timestamp="2011-11-14T18:57:28" xmlns:UML="http://schema.omg.org/spec/UML/1.3" >
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
@@ -102,6 +102,9 @@
         <UML:Generalization xmi.idref="ZVdRgsuZKELN" />
         <UML:Generalization xmi.idref="3MMBumzpG7XC" />
        </UML:GeneralizableElement.generalization>
+       <UML:Classifier.feature>
+        <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="zZHMzsqTyJyB" name="insideFrustum" />
+       </UML:Classifier.feature>
       </UML:Class>
       <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="Z2oCygxy3epf" xmi.id="ZVdRgsuZKELN" parent="J6qXHlxchzMq" name="" />
       <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="JFHkOnc4nZlD" xmi.id="1A3JNPhCUH5V" parent="Z2oCygxy3epf" name="" />
@@ -207,15 +210,15 @@
      </UML:Namespace.ownedElement>
      <XMI.extension xmi.extender="umbrello" >
       <diagrams>
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="class diagram" font="Sans,10,-1,5,50,0,0,0,0,0" canvasheight="785" canvaswidth="1449" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="81" xmi.id="PbF0CcmZxcnO" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="0" showstereotype="0" name="class diagram" font="Sans,10,-1,5,50,0,0,0,0,0" canvasheight="830" canvaswidth="1552" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffffc0" zoom="81" xmi.id="PbF0CcmZxcnO" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="424" showattsigs="601" y="98" showattributes="1" font="Sans,10,-1,5,75,0,0,0,0,0" width="121" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="J6qXHlxchzMq" showscope="1" height="72" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="424" showattsigs="601" y="98" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="121" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="J6qXHlxchzMq" showscope="1" height="72" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="326" showattsigs="601" y="517" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="67" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JFHkOnc4nZlD" showscope="1" height="32" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="757" showattsigs="601" y="511" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="94" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="rG36YOguGgft" showscope="1" height="32" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="942" showattsigs="601" y="506" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="80" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="qRB4itQTVUH2" showscope="1" height="32" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="627" showattsigs="601" y="513" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="47" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="0NjsdvgyuCHT" showscope="1" height="32" showopsigs="601" />
-         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="884" showattsigs="601" y="331" showattributes="1" font="Sans,10,-1,5,75,0,0,0,0,0" width="185" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="tRKo3clH6yzT" showscope="1" height="72" showopsigs="601" />
-         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="489" showattsigs="601" y="350" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="70" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="Z2oCygxy3epf" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="884" showattsigs="601" y="331" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="185" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="tRKo3clH6yzT" showscope="1" height="72" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="426" showattsigs="601" y="336" showattributes="1" font="Sans,10,-1,5,75,0,0,0,0,0" width="124" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="Z2oCygxy3epf" showscope="1" height="40" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="136" showattsigs="601" y="415" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="124" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="HWqxKhoAyn7H" showscope="1" height="32" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="173" showattsigs="601" y="656" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="154" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pMvCpt3xbeEr" showscope="1" height="32" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="341" showattsigs="601" y="657" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="164" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="LwjR0FVi9FGO" showscope="1" height="32" showopsigs="601" />
@@ -226,7 +229,8 @@
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="912" showattsigs="601" y="103" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="98" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="aCSkjpKcYIQB" showscope="1" height="32" showopsigs="601" />
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="876" showattsigs="601" y="10" showattributes="1" font="Sans,10,-1,5,50,0,0,0,0,0" width="59" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="CLERaYxl75Nb" showscope="1" height="32" showopsigs="601" />
          <notewidget width="268" x="109" noteType="0" y="56" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="89" linecolor="none" xmi.id="tsst9QuOreU7" usefillcolor="1" linewidth="none" font="Sans,10,-1,5,50,0,0,0,0,0" text="SceneNode is the basis of all scene&#xa;related objects" />
-         <notewidget width="117" x="1169" noteType="0" y="68" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="135" linecolor="none" xmi.id="C5MU06Rmn4O7" usefillcolor="1" linewidth="none" font="Sans,10,-1,5,50,0,0,0,0,0" text="Passes:&#xa;- MS&#xa;- BS&#xa;- IS&#xa;- DP" />
+         <notewidget width="117" x="1260" noteType="0" y="142" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="135" linecolor="none" xmi.id="C5MU06Rmn4O7" usefillcolor="1" linewidth="none" font="Sans,10,-1,5,50,0,0,0,0,0" text="Passes:&#xa;- MS&#xa;- BS&#xa;- IS&#xa;- DP" />
+         <notewidget width="179" x="1031" noteType="0" y="104" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="130" linecolor="none" xmi.id="uLDYJh1g4PSb" usefillcolor="1" linewidth="none" font="Sans,10,-1,5,50,0,0,0,0,0" text="The OctreeNode contains Renderables" />
         </widgets>
         <messages/>
         <associations>
@@ -313,19 +317,19 @@
            <startpoint startx="905" starty="42" />
            <endpoint endx="961" endy="103" />
           </linepath>
-          <floatingtext width="16" x="895" y="46" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="jXjGeGIVDq81" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
-          <floatingtext width="15" x="957" y="79" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="6jPGCegzpYaR" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
+          <floatingtext width="16" x="895" y="46" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="vPHEKWjEcGbg" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
+          <floatingtext width="15" x="957" y="79" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="pjjeyWVMOOmX" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
          </assocwidget>
          <assocwidget indexa="1" indexb="1" widgetaid="Z2oCygxy3epf" linecolor="none" totalcounta="2" xmi.id="3MMBumzpG7XC" widgetbid="tRKo3clH6yzT" totalcountb="4" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="559" starty="366" />
+           <startpoint startx="550" starty="356" />
            <endpoint endx="884" endy="349" />
           </linepath>
          </assocwidget>
          <assocwidget indexa="2" indexb="1" widgetaid="JFHkOnc4nZlD" linecolor="none" totalcounta="3" xmi.id="6deEBqMPAeYr" widgetbid="Z2oCygxy3epf" totalcountb="3" type="500" linewidth="none" >
           <linepath>
            <startpoint startx="370" starty="517" />
-           <endpoint endx="512" endy="382" />
+           <endpoint endx="467" endy="376" />
           </linepath>
          </assocwidget>
          <assocwidget indexa="2" indexb="1" widgetaid="aCSkjpKcYIQB" linecolor="none" totalcounta="3" xmi.id="7zcnD3kOQKlZ" widgetbid="tRKo3clH6yzT" totalcountb="2" type="501" linewidth="none" >
@@ -337,12 +341,12 @@
          <assocwidget indexa="1" indexb="2" widgetaid="0NjsdvgyuCHT" linecolor="none" totalcounta="3" xmi.id="mDLBX4kpG6g7" widgetbid="Z2oCygxy3epf" totalcountb="3" type="500" linewidth="none" >
           <linepath>
            <startpoint startx="642" starty="513" />
-           <endpoint endx="535" endy="382" />
+           <endpoint endx="508" endy="376" />
           </linepath>
          </assocwidget>
          <assocwidget indexa="1" indexb="1" widgetaid="Z2oCygxy3epf" linecolor="none" totalcounta="2" xmi.id="LxJc3xjPujQg" widgetbid="aCSkjpKcYIQB" totalcountb="3" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="524" starty="350" />
+           <startpoint startx="488" starty="336" />
            <endpoint endx="944" endy="135" />
           </linepath>
          </assocwidget>
@@ -373,13 +377,15 @@
   </UML:Model>
  </XMI.content>
  <XMI.extensions xmi.extender="umbrello" >
-  <docsettings viewid="PbF0CcmZxcnO" uniqueid="C5MU06Rmn4O7" documentation="" />
+  <docsettings viewid="PbF0CcmZxcnO" uniqueid="zZHMzsqTyJyB" documentation="" />
   <listview>
    <listitem open="1" type="800" label="Views" >
     <listitem open="1" type="801" id="Logical View" >
      <listitem open="0" type="807" id="PbF0CcmZxcnO" label="class diagram" />
      <listitem open="1" type="813" id="JFHkOnc4nZlD" />
-     <listitem open="1" type="813" id="Z2oCygxy3epf" />
+     <listitem open="1" type="813" id="Z2oCygxy3epf" >
+      <listitem open="0" type="815" id="zZHMzsqTyJyB" />
+     </listitem>
      <listitem open="1" type="813" id="9vKXhXVI6N4T" />
      <listitem open="1" type="813" id="0NjsdvgyuCHT" />
      <listitem open="1" type="813" id="rG36YOguGgft" />