samples/3D/orbitWithMouse: Added image resources for sample Picture windows

- Also fixed wrong icon potentially bouncing on left/right

diff --git a/samples/3D/orbitWithMouse/orbitWithMouse.ec b/samples/3D/orbitWithMouse/orbitWithMouse.ec
index eb34e2f..7172a98 100644 (file)
--- a/samples/3D/orbitWithMouse/orbitWithMouse.ec
+++ b/samples/3D/orbitWithMouse/orbitWithMouse.ec
@@ -994,7 +994,7 @@ class Desktop3D : Window
       static int id = 0;
       static char * shotFileNames[] =
       {
-         ":shot1.jpg", ":shot2.jpg", ":shot3.jpg", ":shot4.jpg"
+         ":img1.jpg", ":img2.jpg", ":img3.jpg", ":img4.jpg", ":img5.jpg"
       };
 
       switch(key)
@@ -1031,7 +1031,7 @@ class Desktop3D : Window
             }
             else
             {
-               if(!dockTimer.started)
+               if(!dockTimer.started && !poppingWindow)
                {
                   dock.lastTime = GetTime();
                   dockTimer.Start();
@@ -1069,7 +1069,7 @@ class Desktop3D : Window
             }
             else
             {
-               if(!dockTimer.started)
+               if(!dockTimer.started && !poppingWindow)
                {
                   dock.lastTime = GetTime();
                   dockTimer.Start();

diff --git a/samples/3D/orbitWithMouse/orbitWithMouse.epj b/samples/3D/orbitWithMouse/orbitWithMouse.epj
index a715418..10eef0e 100644 (file)
--- a/samples/3D/orbitWithMouse/orbitWithMouse.epj
+++ b/samples/3D/orbitWithMouse/orbitWithMouse.epj
@@ -51,11 +51,6 @@
             "../ModelViewer/skycube/up.jpg"
          ]
       },
-      "background.jpg",
-      "shot1.jpg",
-      "shot2.jpg",
-      "shot3.jpg",
-      "shot4.jpg",
       "icon1.png",
       "icon10.png",
       "icon2.png",
@@ -65,6 +60,11 @@
       "icon6.png",
       "icon7.png",
       "icon8.png",
-      "icon9.png"
+      "icon9.png",
+      "img1.jpg",
+      "img2.jpg",
+      "img3.jpg",
+      "img4.jpg",
+      "img5.jpg"
    ]
 }

diff --git a/samples/3D/orbitWithMouse/res/img1.jpg b/samples/3D/orbitWithMouse/res/img1.jpg
new file mode 100644 (file)
index 0000000..192d39e
Binary files /dev/null and b/samples/3D/orbitWithMouse/res/img1.jpg differ

diff --git a/samples/3D/orbitWithMouse/res/img2.jpg b/samples/3D/orbitWithMouse/res/img2.jpg
new file mode 100644 (file)
index 0000000..6ab3815
Binary files /dev/null and b/samples/3D/orbitWithMouse/res/img2.jpg differ

diff --git a/samples/3D/orbitWithMouse/res/img3.jpg b/samples/3D/orbitWithMouse/res/img3.jpg
new file mode 100644 (file)
index 0000000..f55bf07
Binary files /dev/null and b/samples/3D/orbitWithMouse/res/img3.jpg differ

diff --git a/samples/3D/orbitWithMouse/res/img4.jpg b/samples/3D/orbitWithMouse/res/img4.jpg
new file mode 100644 (file)
index 0000000..c5baba0
Binary files /dev/null and b/samples/3D/orbitWithMouse/res/img4.jpg differ

diff --git a/samples/3D/orbitWithMouse/res/img5.jpg b/samples/3D/orbitWithMouse/res/img5.jpg
new file mode 100644 (file)
index 0000000..424961b
Binary files /dev/null and b/samples/3D/orbitWithMouse/res/img5.jpg differ