diff options
| author | Tim Redfern <tim@eclectronics.org> | 2012-02-23 11:32:58 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2012-02-23 11:32:58 +0000 |
| commit | ae7ee51ff98697cf16122684489bfa9ba125b009 (patch) | |
| tree | bf2e0ecc408460937288f3beee0c8ca12332f6f3 | |
| parent | 61e590513b2e725a8df7eed75a041b188d4ecd39 (diff) | |
saving model settings avoids segmentation fault
| -rw-r--r-- | bin/data/settings.xml | 6 | ||||
| -rw-r--r-- | map4.layout | 13 | ||||
| -rw-r--r-- | src/testApp.cpp | 6 |
3 files changed, 16 insertions, 9 deletions
diff --git a/bin/data/settings.xml b/bin/data/settings.xml index 53dfbf7..ba0a4f8 100644 --- a/bin/data/settings.xml +++ b/bin/data/settings.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" ?> -<map4> +<map4 model="tigerbottle.3DS" x="0" y="101" z="0"> <view> - <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="16.349150" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.457062" lng="12.734703" dolly="632.609375" /> + <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="14.054886" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.457062" lng="12.734703" dolly="737.189148" /> </view> <view> - <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="16.348951" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.458065" lng="106.842819" dolly="632.617554" /> + <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="14.324753" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="37.458065" lng="106.842819" dolly="723.159424" /> </view> <clip> <settings file="glow_bars.mov" /> diff --git a/map4.layout b/map4.layout index 98f5fcf..291d1d1 100644 --- a/map4.layout +++ b/map4.layout @@ -8,11 +8,14 @@ <Cursor position="1033" topLine="0" /> </File> <File name="bin/data/settings.xml" open="1" top="0" tabpos="3"> - <Cursor position="797" topLine="0" /> + <Cursor position="69" topLine="0" /> </File> <File name="config.make" open="0" top="0" tabpos="3"> <Cursor position="548" topLine="0" /> </File> + <File name="src/keyVar.cpp" open="1" top="0" tabpos="8"> + <Cursor position="1236" topLine="16" /> + </File> <File name="src/keyVar.h" open="0" top="0" tabpos="8"> <Cursor position="0" topLine="0" /> </File> @@ -26,15 +29,15 @@ <Cursor position="165" topLine="0" /> </File> <File name="src/testApp.cpp" open="1" top="1" tabpos="2"> - <Cursor position="637" topLine="6" /> + <Cursor position="706" topLine="4" /> </File> <File name="src/testApp.h" open="1" top="0" tabpos="1"> - <Cursor position="1326" topLine="31" /> + <Cursor position="1267" topLine="33" /> </File> <File name="src/viewpoint.cpp" open="1" top="0" tabpos="5"> - <Cursor position="1494" topLine="0" /> + <Cursor position="566" topLine="0" /> </File> <File name="src/viewpoint.h" open="1" top="0" tabpos="7"> - <Cursor position="808" topLine="19" /> + <Cursor position="808" topLine="13" /> </File> </CodeBlocks_layout_file> diff --git a/src/testApp.cpp b/src/testApp.cpp index 5e0661e..7ae3aca 100644 --- a/src/testApp.cpp +++ b/src/testApp.cpp @@ -40,7 +40,7 @@ void testApp::setup(){ texture.play(); light=true; - + } //-------------------------------------------------------------- @@ -203,6 +203,10 @@ void testApp::saveSettings(string filename){ //send a pointer to the vp //renavigate? easiest way to get the settings back out + XML.setAttribute("map4","model",model_name,0); + XML.setAttribute("map4","x",ofToString(model_x),0); + XML.setAttribute("map4","y",ofToString(model_y),0); + XML.setAttribute("map4","z",ofToString(model_z),0); if(XML.pushTag("map4")) { for (int i=0;i<numViews;i++){ XML.pushTag("view",i); |