Menu
▾
▴
ogoglio-commits — for people that want commit messages from SVN
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
(26) |
Aug
(85) |
Sep
(141) |
Oct
(85) |
Nov
(60) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(38) |
Feb
(78) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tre...@us...> - 2007-09-17 23:35:29
|
Revision: 411
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=411&view=rev
Author: trevorolio
Date: 2007-09-17 16:35:33 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Refactored the way user animations are referenced so as to reduce duplicate code and allow for easy addition.
Now avatars can /wave /clap /point and /laugh in addition to the usual standing and walking animations.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java
Added Paths:
-----------
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-clap.bvh
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-laugh.bvh
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-09-17 23:35:27 UTC (rev 410)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java 2007-09-17 23:35:33 UTC (rev 411)
@@ -725,16 +725,7 @@
}
public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
- if (animationID == 1) {
- return UIConstants.getResource("avatar/avatar.bvh");
- } else if (animationID == 2) {
- return UIConstants.getResource("avatar/avatar-walk.bvh");
- } else if (animationID == 3) {
- return UIConstants.getResource("avatar/avatar-wave.bvh");
- } else if (animationID == 4) {
- return UIConstants.getResource("avatar/avatar-point.bvh");
- }
- return null;
+ return UIConstants.getUserAnimation((int) animationID);
}
public InputStream getUserSkinMapStream(String username) throws IOException {
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-09-17 23:35:27 UTC (rev 410)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-09-17 23:35:33 UTC (rev 411)
@@ -416,7 +416,7 @@
startRenderableMotion(renderable, path);
if (!offScreen) {
try {
- BvhParser bvhParser = new BvhParser(user, 2);
+ BvhParser bvhParser = new BvhParser(user, 1);
Bvh bvh = bvhParser.parse();
renderable.playAnimation(bvh, true);
} catch (IOException e) {
@@ -647,7 +647,7 @@
private UserRenderable createUserRenderable(User user) throws IOException, RenderableParseException {
try {
boolean isLocalUser = !offScreen && username != null && user.getUsername().equals(username);
- Bvh defaultBvh = new BvhParser(user, 1).parse();
+ Bvh defaultBvh = new BvhParser(user, 0).parse();
final J3DUserRenderable renderable = new J3DUserRenderable(user, !offScreen && !isLocalUser, defaultBvh);
renderable.setID(USER_ID_PREFIX + user.getUsername());
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java 2007-09-17 23:35:27 UTC (rev 410)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/render/UIConstants.java 2007-09-17 23:35:33 UTC (rev 411)
@@ -54,6 +54,38 @@
public static Color3f DARK_GREEN = new Color3f(0.6468f, 0.7867f, 0.0664f);
+ public static final String DEFAULT_ANIMATION_PATH = "avatar/avatar.bvh";
+
+ public static final String WALK_ANIMATION_PATH = "avatar/avatar-walk.bvh";
+
+ public static final String WAVE_ANIMATION_PATH = "avatar/avatar-wave.bvh";
+
+ public static final String POINT_ANIMATION_PATH = "avatar/avatar-point.bvh";
+
+ public static final String LAUGH_ANIMATION_PATH = "avatar/avatar-laugh.bvh";
+
+ public static final String CLAP_ANIMATION_PATH = "avatar/avatar-clap.bvh";
+
+ public static final String[] USER_ANIMATION_COMMANDS = { "default", "walk", "wave", "point", "laugh", "clap" };
+
+ public static final String[] USER_ANIMATION_PATHS = { DEFAULT_ANIMATION_PATH, WALK_ANIMATION_PATH, WAVE_ANIMATION_PATH, POINT_ANIMATION_PATH, LAUGH_ANIMATION_PATH, CLAP_ANIMATION_PATH };
+
+ public static InputStream getUserAnimation(int animationID) {
+ if(animationID < 0 || animationID >= USER_ANIMATION_PATHS.length){
+ return null;
+ }
+ return getResource(USER_ANIMATION_PATHS[animationID]);
+ }
+
+ public static InputStream getUserAnimation(String command) {
+ for (int i = 0; i < USER_ANIMATION_COMMANDS.length; i++) {
+ if (USER_ANIMATION_COMMANDS[i].equals(command)) {
+ return getResource(USER_ANIMATION_PATHS[i]);
+ }
+ }
+ return null;
+ }
+
public static ImageIcon loadIconFromResource(String resourcePath) {
try {
byte[] buffer = null;
Added: maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-clap.bvh
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-clap.bvh (rev 0)
+++ maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-clap.bvh 2007-09-17 23:35:33 UTC (rev 411)
@@ -0,0 +1,159 @@
+HIERARCHY
+ROOT hip
+{
+ OFFSET 0.00 0.00 0.00
+ CHANNELS 6 Xposition Yposition Zposition Xrotation Zrotation Yrotation
+ JOINT abdomen
+ {
+ OFFSET 0.000000 0.000000 0.000000
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT chest
+ {
+ OFFSET 0.000000 5.018152 -1.882228
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT neckDummy
+ {
+ OFFSET 0.000000 8.316447 0.784897
+ CHANNELS 3 Xrotation Yrotation Zrotation
+ JOINT neck
+ {
+ OFFSET 0.000000 2.280413 -0.392801
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT head
+ {
+ OFFSET 0.000000 3.496879 0.529469
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT figureHair
+ {
+ OFFSET 0.000000 4.699570 0.720622
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ End Site
+ {
+ OFFSET 0.000000 -6.419331 0.000000
+ }
+ }
+ }
+ }
+ }
+ JOINT lCollar
+ {
+ OFFSET 0.599237 8.316447 0.784897
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT lShldr
+ {
+ OFFSET 6.421198 0.010146 -0.332128
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ JOINT lForeArm
+ {
+ OFFSET 10.552783 0.025574 0.125508
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT lHand
+ {
+ OFFSET 11.035963 0.319619 0.041520
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ End Site
+ {
+ OFFSET 10.353753 0.000000 0.000000
+ }
+ }
+ }
+ }
+ }
+ JOINT rCollar
+ {
+ OFFSET -0.599237 8.316447 0.784897
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT rShldr
+ {
+ OFFSET -6.421198 0.010146 -0.332128
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ JOINT rForeArm
+ {
+ OFFSET -10.552783 0.025574 0.125508
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT rHand
+ {
+ OFFSET -11.035963 0.319619 0.041520
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ End Site
+ {
+ OFFSET -10.353753 0.000000 0.000000
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ JOINT lThigh
+ {
+ OFFSET 4.500466 -6.400484 -1.832696
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT lShin
+ {
+ OFFSET -1.359117 -18.918689 1.179887
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT lFoot
+ {
+ OFFSET -0.652380 -17.215186 -0.312137
+ CHANNELS 3 Xrotation Yrotation Zrotation
+ End Site
+ {
+ OFFSET 0.000000 0.000000 10.353752
+ }
+ }
+ }
+ }
+ JOINT rThigh
+ {
+ OFFSET -4.500466 -6.400484 -1.832696
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT rShin
+ {
+ OFFSET 1.359117 -18.918689 1.179887
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT rFoot
+ {
+ OFFSET 0.652380 -17.215186 -0.312137
+ CHANNELS 3 Xrotation Yrotation Zrotation
+ End Site
+ {
+ OFFSET 0.000000 0.000000 10.353752
+ }
+ }
+ }
+ }
+}
+MOTION
+Frames: 30
+Frame Time: 0.055556
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -70.100700 9.978770 15.991600 -22.515600 -9.303740 0.147736 5.969490 -0.173112 0.175734 -2.021920 5.690310 -0.063351 70.100700 -9.978770 15.991600 22.458700 9.274270 0.122349 -5.969490 0.173112 0.175734 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -0.840470 -0.504482 -0.172233 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -66.714951 0.810504 15.136398 -33.059364 -0.471056 6.272503 -0.085772 9.730258 -0.696427 -2.021920 5.690310 -0.063351 68.610527 -1.751922 15.520359 32.760422 1.819201 -2.318790 -4.378768 -3.380067 -0.017181 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -1.992414 -1.191491 -0.406759 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -61.547604 -10.858863 13.523763 -46.199417 11.783067 16.405573 -3.629590 18.011200 -1.307420 -2.021920 5.690310 -0.063351 66.482704 8.622679 14.782897 45.543797 -8.842199 -6.691029 -5.481440 -5.567040 -0.304790 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -3.107702 -1.859236 -0.634722 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -56.850883 -22.681469 12.218906 -59.688835 23.561611 25.200680 3.307336 16.108097 -0.694552 -2.021920 5.690310 -0.063351 64.472473 19.194889 14.122459 58.702427 -18.905880 -10.324443 -14.858359 -1.951636 -0.729330 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -3.785351 -2.278148 -0.777805 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -55.558533 -32.531364 12.732746 -71.785385 30.280514 25.378662 16.408247 7.717693 0.635648 -2.021920 5.690310 -0.063351 63.504807 28.299826 13.993483 70.672028 -23.704298 -9.481764 -27.760672 4.845032 -1.100487 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -3.624380 -2.218660 -0.757690 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -60.604301 -38.282600 16.576200 -80.746803 27.355700 9.660360 28.074699 -0.262909 1.787490 -2.021920 5.690310 -0.063351 64.504700 34.272598 14.850400 79.888298 -18.569901 -0.425720 -36.631699 10.323200 -1.161880 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.406863 -1.546188 -0.528601 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -73.062302 -38.744316 24.247868 -85.340576 12.983446 -23.649031 32.840622 -2.565665 2.114388 -2.021920 5.690310 -0.063351 67.945839 36.064339 16.918980 85.267357 -1.755827 17.642315 -36.402676 11.160021 -0.777410 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -0.647106 -0.506089 -0.174925 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -86.568100 -36.465996 32.197067 -86.372940 -3.518627 -53.906895 33.769402 -0.438777 1.966177 -2.021920 5.690310 -0.063351 72.496849 35.090260 19.510347 87.646965 16.802063 33.766411 -31.956453 8.740308 -0.292083 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 0.957528 0.561300 0.186407 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -85.159790 -10.052569 -54.886265 36.056801 3.240490 1.941800 -2.021920 5.690310 -0.063351 76.375092 33.381584 21.706974 88.345306 24.247229 34.051987 -30.663799 5.625790 -0.171181 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 1.851923 1.378696 0.460220 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -83.148346 -0.539186 -15.996121 42.363014 5.932910 2.379979 -2.021920 5.690310 -0.063351 78.238228 32.552097 22.818314 88.503876 14.107533 13.276083 -36.643330 3.865294 -0.649059 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 2.049955 1.921054 0.638355 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -82.310997 7.025680 10.810800 45.206001 6.451450 2.578560 -2.021920 5.690310 -0.063351 78.505211 32.545792 23.061838 88.557701 5.448470 0.902143 -41.005100 3.456010 -1.036360 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 1.707748 2.226383 0.734403 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -83.855423 -2.884452 -17.438789 38.683754 4.672059 1.959642 -2.021920 5.690310 -0.063351 78.035278 32.889210 22.882013 88.740509 14.876419 20.468351 -35.923370 3.821422 -0.727013 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 0.981424 2.332698 0.761958 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -85.405380 -11.843541 -45.256367 33.356602 3.370450 1.483220 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 89.187500 23.623600 37.125320 -30.837900 4.141800 -0.371817 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 0.027108 2.278009 0.734614 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -84.548409 -2.152703 -18.789125 38.927315 4.828315 2.024116 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 89.664413 13.680943 18.548706 -35.170437 3.827948 -0.642340 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -0.999076 2.100329 0.665963 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -82.310997 7.025680 10.810800 45.206001 6.451450 2.578560 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 88.557701 5.448470 0.902143 -41.005100 3.456010 -1.036360 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -1.941007 1.837669 0.569598 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -80.412735 -3.097756 -9.119162 41.798904 5.629185 2.154696 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 85.081345 18.386852 19.422497 -39.662682 3.624926 -0.982284 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.642560 1.528040 0.459114 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -79.906303 -12.958900 -32.277901 37.389599 4.560890 1.686930 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 83.138756 29.790140 37.151352 -36.748402 3.859450 -0.804833 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.994490 1.212298 0.348815 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.139938 -3.116477 -10.757759 41.159752 5.543164 2.128106 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 85.855698 17.716618 17.918472 -38.700531 3.654023 -0.897978 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -3.075063 0.942666 0.255858 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -82.310997 7.025680 10.810800 45.206001 6.451450 2.578560 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 88.557701 5.448470 0.902143 -41.005100 3.456010 -1.036360 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -3.009421 0.774211 0.198110 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.831970 -2.023535 -12.634043 41.334332 5.161318 2.126635 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 86.775314 16.143488 24.086418 -38.749317 3.721606 -0.954981 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.922710 0.761999 0.193441 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.127098 -11.259400 -35.341900 37.273102 3.969990 1.665200 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 84.659447 27.238169 45.330318 -36.377300 3.989400 -0.849616 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.905299 0.932208 0.250285 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.693878 -1.702936 -11.916260 40.954811 5.149749 2.099351 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 86.504433 16.088291 23.410763 -38.495796 3.779540 -0.934428 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.908467 1.195462 0.339337 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -82.310997 7.025680 10.810800 45.206001 6.451450 2.578560 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 88.557701 5.448470 0.902143 -41.005100 3.456010 -1.036360 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.848719 1.433494 0.421860 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.697075 -4.312685 -13.537966 42.519302 5.572637 2.227027 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 86.903908 17.888819 20.590324 -39.569717 3.457184 -0.970542 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.642560 1.528040 0.459114 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.049301 -14.833800 -37.291901 39.157700 4.519030 1.823500 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 85.023682 29.842606 42.309601 -37.617500 3.675150 -0.892063 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -2.234550 1.395161 0.423478 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.608429 -4.023938 -13.131547 41.823509 5.402511 2.178931 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 86.578514 17.904167 24.240858 -38.938114 3.824486 -0.963367 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -1.687122 1.096336 0.334431 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -82.310997 7.025680 10.810800 45.206001 6.451450 2.578560 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 88.557701 5.448470 0.902143 -41.005100 3.456010 -1.036360 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -1.081482 0.716476 0.219064 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -82.021080 -2.775906 -13.411646 43.562275 5.791809 2.279532 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 87.718666 16.027189 9.582210 -40.867767 2.395170 -0.960393 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 -0.489078 0.326186 0.099811 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.617287 -12.913471 -37.551498 41.433800 5.023420 1.952340 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 86.563751 27.118025 22.315382 -40.194599 1.729710 -0.885129 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -92.897598 -34.932201 35.860802 -81.617287 -12.913471 -37.551498 41.433800 5.023420 1.952340 -2.021920 5.690310 -0.063351 77.687698 33.108898 22.723301 86.563751 27.118025 22.315382 -40.194599 1.729710 -0.885129 -7.548709 4.016634 0.126881 15.890360 -3.336124 -0.813312 -8.628910 1.044381 -0.888102 -7.530616 -4.334307 0.100752 15.830232 3.319340 0.622262 -8.660608 -1.559428 0.936809
Added: maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-laugh.bvh
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-laugh.bvh (rev 0)
+++ maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-laugh.bvh 2007-09-17 23:35:33 UTC (rev 411)
@@ -0,0 +1,169 @@
+HIERARCHY
+ROOT hip
+{
+ OFFSET 0.00 0.00 0.00
+ CHANNELS 6 Xposition Yposition Zposition Xrotation Zrotation Yrotation
+ JOINT abdomen
+ {
+ OFFSET 0.000000 0.000000 0.000000
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT chest
+ {
+ OFFSET 0.000000 5.018152 -1.882228
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT neckDummy
+ {
+ OFFSET 0.000000 8.316447 0.784897
+ CHANNELS 3 Xrotation Yrotation Zrotation
+ JOINT neck
+ {
+ OFFSET 0.000000 2.280413 -0.392801
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT head
+ {
+ OFFSET 0.000000 3.496879 0.529469
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT figureHair
+ {
+ OFFSET 0.000000 4.699570 0.720622
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ End Site
+ {
+ OFFSET 0.000000 -6.419331 0.000000
+ }
+ }
+ }
+ }
+ }
+ JOINT lCollar
+ {
+ OFFSET 0.599237 8.316447 0.784897
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT lShldr
+ {
+ OFFSET 6.421198 0.010146 -0.332128
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ JOINT lForeArm
+ {
+ OFFSET 10.552783 0.025574 0.125508
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT lHand
+ {
+ OFFSET 11.035963 0.319619 0.041520
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ End Site
+ {
+ OFFSET 10.353753 0.000000 0.000000
+ }
+ }
+ }
+ }
+ }
+ JOINT rCollar
+ {
+ OFFSET -0.599237 8.316447 0.784897
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT rShldr
+ {
+ OFFSET -6.421198 0.010146 -0.332128
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ JOINT rForeArm
+ {
+ OFFSET -10.552783 0.025574 0.125508
+ CHANNELS 3 Yrotation Zrotation Xrotation
+ JOINT rHand
+ {
+ OFFSET -11.035963 0.319619 0.041520
+ CHANNELS 3 Zrotation Yrotation Xrotation
+ End Site
+ {
+ OFFSET -10.353753 0.000000 0.000000
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ JOINT lThigh
+ {
+ OFFSET 4.500466 -6.400484 -1.832696
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT lShin
+ {
+ OFFSET -1.359117 -18.918689 1.179887
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT lFoot
+ {
+ OFFSET -0.652380 -17.215186 -0.312137
+ CHANNELS 3 Xrotation Yrotation Zrotation
+ End Site
+ {
+ OFFSET 0.000000 0.000000 10.353752
+ }
+ }
+ }
+ }
+ JOINT rThigh
+ {
+ OFFSET -4.500466 -6.400484 -1.832696
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT rShin
+ {
+ OFFSET 1.359117 -18.918689 1.179887
+ CHANNELS 3 Xrotation Zrotation Yrotation
+ JOINT rFoot
+ {
+ OFFSET 0.652380 -17.215186 -0.312137
+ CHANNELS 3 Xrotation Yrotation Zrotation
+ End Site
+ {
+ OFFSET 0.000000 0.000000 10.353752
+ }
+ }
+ }
+ }
+}
+MOTION
+Frames: 40
+Frame Time: 0.050000
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -70.100075 9.898806 15.947086 -22.679041 -9.378357 0.076935 5.966734 0.027484 0.177213 -2.021920 5.690310 -0.063351 70.025291 -9.978496 15.899026 22.669645 9.345270 0.121616 -5.927727 -0.009578 0.195807 -7.544928 3.982114 0.126592 15.855997 -3.300727 -0.855127 -8.588077 1.056593 -0.877759 -7.531943 -4.331991 0.100592 15.798183 3.280715 0.615038 -8.629052 -1.569328 0.946211
+-0.010271 41.118359 0.307273 0.085996 0.000000 0.000000 1.860550 0.000000 0.000000 2.745728 0.000000 0.000000 0.000000 0.000000 0.000000 2.147613 0.000000 0.000000 2.523571 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -3.621321 -0.063351 -60.769238 22.633158 9.701205 -60.819473 -11.540625 -4.099583 17.038702 8.409076 -9.313721 -2.683294 3.926647 -0.063351 61.990688 -21.377106 7.544266 63.949135 11.770497 -4.818159 -34.616604 -14.121561 1.987479 -13.859172 4.413954 0.091478 29.219851 -3.747072 -2.213881 -15.686995 1.333937 -0.402239 -13.877677 -4.719561 0.092055 29.228100 3.731876 2.025729 -15.756878 -1.823401 0.431401
+-0.016757 40.430710 0.401934 0.360902 0.000000 0.000000 2.582707 0.000000 0.000000 2.804512 0.000000 0.000000 0.000000 0.000000 0.000000 4.393749 0.000000 0.000000 6.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -1.361978 -0.063351 -54.347950 27.505209 1.706843 -82.448250 -11.735147 -5.122974 27.053463 11.182085 -16.948801 -3.464698 1.842903 -0.063351 58.343285 -23.815771 -3.089074 86.567177 11.992871 -6.095345 -51.541054 -7.634786 5.964419 -17.240896 4.754851 0.116806 35.981213 -4.079048 -2.845871 -19.309378 1.208248 -0.067937 -17.239689 -5.031274 0.073578 35.959705 4.056794 2.672610 -19.380335 -1.714553 0.107747
+-0.008382 40.802578 0.543712 0.943850 0.000000 0.000000 -0.781819 0.000000 0.000000 -5.455698 0.000000 0.000000 0.000000 0.000000 0.000000 5.648495 0.000000 0.000000 9.639404 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 0.507303 -0.063351 -52.558937 23.850107 -4.320533 -85.442947 -10.932941 -3.147526 41.554634 11.789365 -4.164012 -4.228607 -0.194189 -0.063351 58.459267 -23.127968 -11.228930 91.442383 11.389132 -4.205064 -48.065510 -2.258690 6.485291 -15.119818 4.425831 0.123318 30.516066 -3.758429 -2.361754 -16.577986 1.344090 -0.341416 -15.125618 -4.738601 0.093083 30.496426 3.737144 2.141251 -16.640167 -1.835799 0.395851
+0.000012 41.622555 0.747219 0.721804 0.000000 0.000000 -5.541353 0.000000 0.000000 -13.984964 0.000000 0.000000 0.000000 0.000000 0.000000 5.879698 0.000000 0.000000 7.145627 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 3.309690 -0.063351 -57.664452 16.366896 -7.928518 -76.018021 -9.236874 0.387905 48.259644 -0.529234 8.688077 -5.021920 -2.309690 -0.063351 63.773209 -19.345213 -16.142138 86.118530 9.524081 -1.321514 -39.105270 0.756029 7.875682 -9.675082 4.142613 0.133727 20.285007 -3.522715 -1.279486 -11.596942 1.122424 -0.696653 -9.717536 -4.482477 0.097940 20.335434 3.504250 1.056167 -11.682444 -1.650655 0.778455
+-0.006640 42.117901 1.004920 -1.160762 0.000000 0.000000 -8.473991 0.000000 0.000000 -14.489717 0.000000 0.000000 0.000000 0.000000 0.000000 5.315942 0.000000 0.000000 -6.320387 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 8.046408 -0.063351 -64.059464 14.115295 -8.967882 -70.682701 -8.587154 3.159253 49.060719 1.235633 6.227960 -5.874855 -4.584186 -0.063351 70.511673 -13.771156 -17.670855 78.046280 8.509991 1.623414 -34.932499 2.325882 8.164490 -5.370788 4.016258 -0.012142 16.750927 -3.361353 -0.923691 -10.518554 1.199306 -0.846639 -5.314772 -4.330726 0.146993 16.617525 3.309831 0.732556 -10.498503 -1.706569 0.897887
+-0.017095 42.403416 1.235070 -3.233081 0.000000 0.000000 -10.263157 0.000000 0.000000 -12.295529 0.000000 0.000000 0.000000 0.000000 0.000000 4.204370 0.000000 0.000000 -23.939898 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 12.591924 -0.063351 -69.264977 14.495419 -9.853712 -69.473808 -9.073883 5.069040 48.429314 10.079828 1.321527 -6.607224 -6.537172 -0.063351 75.076775 -9.026360 -18.360806 70.467896 9.488623 4.077843 -34.169331 3.029945 6.832536 -0.683850 3.884941 -0.134141 12.780602 -3.147610 -0.506773 -9.167995 1.219404 -1.035202 -0.617184 -4.179561 0.227888 12.621013 3.116739 0.376665 -9.141037 -1.755341 1.012011
+-0.010476 41.310463 1.056106 -3.297503 0.000000 0.000000 -10.242665 0.000000 0.000000 -11.905660 0.000000 0.000000 0.000000 0.000000 0.000000 2.765669 0.000000 0.000000 -37.725101 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 7.945296 -0.063351 -65.077995 14.895652 -12.153617 -77.501472 -8.670601 4.788541 46.536110 15.284908 6.733319 -6.603879 -0.896672 -0.063351 71.399284 -8.255731 -20.721535 77.622192 8.154063 4.685382 -31.138474 -2.084692 11.098236 -8.290133 4.415723 -0.104427 28.430641 -3.880877 -2.040521 -17.124245 1.375353 -0.388729 -8.305365 -4.720389 0.254286 28.439974 3.838488 1.914769 -17.199219 -1.937127 0.419978
+-0.012367 41.779510 1.120409 -3.361924 0.000000 0.000000 -10.222174 0.000000 0.000000 -11.515790 0.000000 0.000000 0.000000 0.000000 0.000000 1.096119 0.000000 0.000000 -46.669670 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 3.298669 -0.063351 -62.663925 16.383896 -13.701468 -79.573524 -8.190179 5.210461 45.676304 14.740353 7.829687 -6.600534 4.743827 -0.063351 68.443520 -9.091352 -23.188984 78.998993 7.230711 5.656795 -28.961515 -0.465293 11.946069 -5.407282 4.225859 -0.115654 22.718220 -3.667187 -1.457884 -14.245088 1.339630 -0.623764 -5.389634 -4.529818 0.238972 22.668276 3.629720 1.340570 -14.282635 -1.887923 0.642506
+-0.014258 42.248562 1.184712 -3.426345 0.000000 0.000000 -10.201682 0.000000 0.000000 -11.125920 0.000000 0.000000 0.000000 0.000000 0.000000 -0.739095 0.000000 0.000000 -51.512627 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 9.343772 -0.063351 -68.398941 15.327644 -10.441977 -73.130646 -8.691586 5.199170 48.790661 11.583031 3.813997 -6.597189 -3.412666 -0.063351 74.701187 -8.373110 -18.974842 69.710678 7.617961 5.766746 -34.117260 5.950816 6.151468 -1.874886 3.988271 -0.122700 15.574507 -3.326889 -0.741701 -10.584332 1.226017 -0.921747 -1.853266 -4.288248 0.247302 15.522566 3.304447 0.638326 -10.630560 -1.806680 0.906293
+-0.010898 41.640247 1.098845 -3.490767 0.000000 0.000000 -10.181190 0.000000 0.000000 -10.736051 0.000000 0.000000 0.000000 0.000000 0.000000 -2.674792 0.000000 0.000000 -52.992992 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 15.388875 -0.063351 -73.122253 13.234159 -8.418245 -70.531822 -9.462167 4.667462 50.638580 12.241563 2.802328 -6.593844 -11.569159 -0.063351 80.659592 -5.648749 -15.813440 63.464569 8.163573 5.574980 -37.872616 7.944730 2.563519 -6.192236 4.295581 -0.107601 24.641422 -3.759767 -1.634943 -15.245638 1.336629 -0.534024 -6.183058 -4.599506 0.252429 24.601904 3.711618 1.535006 -15.293869 -1.912523 0.563538
+-0.007538 41.031929 1.012978 -3.555188 0.000000 0.000000 -10.160699 0.000000 0.000000 -10.346181 0.000000 0.000000 0.000000 0.000000 0.000000 -4.645789 0.000000 0.000000 -51.849800 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 10.491253 -0.063351 -69.322952 14.180934 -10.299259 -77.010513 -8.856428 4.689775 49.264603 15.626760 7.093785 -6.590499 -3.743122 -0.063351 75.227432 -6.694110 -18.787531 71.602318 7.432240 5.772226 -34.521248 4.308579 7.420740 -9.429654 4.524744 -0.117649 31.448879 -4.009010 -2.322927 -18.731001 1.370772 -0.242664 -9.475706 -4.838962 0.279452 31.506443 3.959280 2.236776 -18.817945 -1.959519 0.290801
+-0.139582 41.601116 1.096020 -3.619610 0.000000 0.000000 -10.140207 0.000000 0.000000 -9.956311 0.000000 0.000000 0.000000 0.000000 0.000000 -6.586903 0.000000 0.000000 -48.822083 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 5.593630 -0.063351 -66.537186 15.624428 -11.898361 -78.357567 -8.249031 5.288404 48.099026 14.679449 7.606697 -6.587154 4.082914 -0.063351 70.791191 -8.249175 -22.074799 74.854958 6.826747 6.352305 -31.936533 5.728554 9.629100 -6.302633 4.531005 -0.121458 25.190359 -3.791892 -1.671981 -15.552771 1.297519 -0.721361 -6.281575 -4.413047 0.250588 25.129253 3.756336 1.572909 -15.596804 -1.930598 0.321538
+-0.271627 42.170303 1.179062 -3.684031 0.000000 0.000000 -10.119715 0.000000 0.000000 -9.566442 0.000000 0.000000 0.000000 0.000000 0.000000 -8.432952 0.000000 0.000000 -44.648865 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 9.985734 -0.063351 -70.640289 14.553143 -9.513869 -71.855453 -8.668118 5.357058 50.216900 11.522884 3.433270 -6.583809 -2.935160 -0.063351 76.249367 -7.404325 -17.680586 65.732674 6.920321 6.598426 -37.685295 11.500850 3.311301 -2.307995 4.461255 -0.116502 17.151234 -3.417994 -0.870897 -11.453455 1.183951 -1.258371 -2.186203 -3.920992 0.271296 16.881554 3.387882 0.750836 -11.403758 -1.861682 0.439336
+-0.250454 41.725060 1.112827 -3.748452 0.000000 0.000000 -10.099222 0.000000 0.000000 -9.176572 0.000000 0.000000 0.000000 0.000000 0.000000 -10.118756 0.000000 0.000000 -40.069176 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 14.377837 -0.063351 -74.171532 12.955590 -7.974244 -69.832588 -9.370209 4.827191 51.810883 11.901788 2.731478 -6.580464 -9.953235 -0.063351 82.116280 -4.554294 -15.810215 59.210098 7.005426 6.648946 -40.617184 14.232158 0.109990 -5.413714 4.664753 -0.118854 23.667105 -3.743147 -1.511599 -14.792798 1.242776 -0.961871 -5.378734 -4.188510 0.254477 23.575365 3.717916 1.403122 -14.838878 -1.928967 0.198164
+-0.229281 41.279819 1.046592 -3.812874 0.000000 0.000000 -10.078731 0.000000 0.000000 -8.786702 0.000000 0.000000 0.000000 0.000000 0.000000 -11.579132 0.000000 0.000000 -35.822044 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 9.118984 -0.063351 -70.343781 14.323774 -9.877327 -76.467735 -8.790308 4.841930 50.566326 14.784171 7.062213 -6.577119 -2.857948 -0.063351 76.472885 -6.146634 -17.542717 66.755104 6.741366 6.707989 -38.139236 11.009989 3.889213 -7.936410 4.827176 -0.148690 28.973953 -3.967267 -2.043511 -17.493408 1.284915 -0.700802 -7.890735 -4.399909 0.245702 28.874331 3.915417 1.955709 -17.529318 -1.974647 0.017791
+-0.212937 41.770401 1.118499 -3.877295 0.000000 0.000000 -10.058239 0.000000 0.000000 -8.396832 0.000000 0.000000 0.000000 0.000000 0.000000 -12.748899 0.000000 0.000000 -32.498047 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 3.860131 -0.063351 -67.561089 15.880244 -11.561610 -78.811195 -8.213477 5.323454 49.643314 14.143347 8.424545 -6.573774 4.237339 -0.063351 72.242958 -7.158633 -21.372650 69.095436 6.347313 7.186164 -35.094429 12.954231 6.133455 -4.966170 4.593131 -0.114443 23.075575 -3.739568 -1.428598 -14.510855 1.215032 -0.929472 -4.921994 -4.237965 0.260471 22.974718 3.707265 1.327985 -14.538404 -1.890724 0.276609
+-0.196593 42.260986 1.190407 -3.941716 0.000000 0.000000 -10.037746 0.000000 0.000000 -8.006963 0.000000 0.000000 0.000000 0.000000 0.000000 -13.562872 0.000000 0.000000 -30.093958 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 8.837438 -0.063351 -72.326637 14.702700 -8.843194 -72.495895 -8.691233 5.323039 52.215816 11.263083 4.439638 -6.570429 -2.053225 -0.063351 76.564217 -5.161790 -17.509361 58.847088 6.290575 7.396144 -40.959324 18.228859 -0.851401 -1.301326 4.299650 -0.108931 15.687284 -3.371808 -0.686784 -10.742620 1.126019 -1.202709 -1.199632 -4.008519 0.294260 15.446670 3.342500 0.579078 -10.697686 -1.819924 0.601208
+-0.176092 41.877712 1.143394 -4.006138 0.000000 0.000000 -10.017254 0.000000 0.000000 -7.617094 0.000000 0.000000 0.000000 0.000000 0.000000 -13.955870 0.000000 0.000000 -28.458105 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 13.814744 -0.063351 -76.399956 13.037279 -7.066567 -69.927887 -9.414158 4.827494 53.983643 11.424513 3.304199 -6.567084 -8.343789 -0.063351 81.908134 -2.213641 -16.037432 52.230400 6.368662 7.307606 -43.972290 21.014206 -4.109238 -4.142118 4.490926 -0.114236 21.728954 -3.687076 -1.283258 -13.865335 1.198398 -0.928644 -4.050610 -4.249982 0.280315 21.508989 3.659187 1.165064 -13.831415 -1.872044 0.398019
+-0.155591 41.494438 1.096381 -4.070559 0.000000 0.000000 -9.996762 0.000000 0.000000 -7.227224 0.000000 0.000000 0.000000 0.000000 0.000000 -13.886482 0.000000 0.000000 -27.438812 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 8.152535 -0.063351 -72.358643 14.594524 -9.012877 -76.545517 -8.806590 4.843211 52.714905 13.859917 7.705511 -6.563739 -2.696175 -0.063351 77.269524 -3.931566 -17.046329 58.800198 6.292258 7.308930 -41.993805 18.469952 -1.008319 -6.405059 4.638837 -0.117062 26.527254 -3.914130 -1.768285 -16.332088 1.228262 -0.692947 -6.383582 -4.458982 0.275941 26.466043 3.878540 1.668709 -16.387144 -1.901935 0.214410
+-0.138710 41.866756 1.152977 -4.134980 0.000000 0.000000 -9.976271 0.000000 0.000000 -6.837355 0.000000 0.000000 0.000000 0.000000 0.000000 -13.408401 0.000000 0.000000 -26.884415 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 2.490327 -0.063351 -69.161697 16.076376 -10.918886 -79.471863 -8.209517 5.289909 51.563690 13.570396 9.558954 -6.560394 2.951439 -0.063351 73.957977 -5.349032 -20.191658 62.257504 6.097746 7.556466 -39.311695 19.614569 1.519239 -4.016798 4.445890 -0.109630 21.813917 -3.721409 -1.255993 -13.946865 1.160888 -0.854116 -3.986725 -4.325676 0.300490 21.733070 3.684533 1.175845 -13.989437 -1.869487 0.434837
+-0.121830 42.239075 1.209572 -4.199402 0.000000 0.000000 -9.955778 0.000000 0.000000 -6.447486 0.000000 0.000000 0.000000 0.000000 0.000000 -12.599093 0.000000 0.000000 -26.643242 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 5.993531 -0.063351 -72.484787 15.181485 -8.855610 -74.758347 -8.731865 5.086925 53.683559 11.411582 6.630466 -6.557049 -2.562600 -0.063351 77.876038 -2.668850 -17.137407 52.152836 5.942263 7.692486 -45.004879 24.258802 -5.281081 -1.167748 4.214187 -0.088283 16.126537 -3.426784 -0.684601 -11.061582 1.077444 -1.057900 -1.141786 -4.158036 0.308154 16.045095 3.397320 0.607422 -11.097178 -1.798906 0.694477
+-0.101380 41.903847 1.164066 -4.263824 0.000000 0.000000 -9.935286 0.000000 0.000000 -6.057617 0.000000 0.000000 0.000000 0.000000 0.000000 -11.536019 0.000000 0.000000 -26.563618 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 9.496736 -0.063351 -75.292389 14.017561 -7.473940 -73.332932 -9.504474 4.434540 55.305244 11.683416 6.206869 -6.553703 -8.076639 -0.063351 82.406868 0.474785 -15.632614 45.215191 5.929681 7.590123 -48.489777 26.796183 -9.187887 -3.631421 4.376801 -0.094671 21.340349 -3.714652 -1.191699 -13.743546 1.130400 -0.811089 -3.600805 -4.376443 0.301985 21.268358 3.682625 1.122321 -13.776800 -1.837777 0.510607
+-0.080930 41.568623 1.118559 -4.328245 0.000000 0.000000 -9.914794 0.000000 0.000000 -5.667747 0.000000 0.000000 0.000000 0.000000 0.000000 -10.296641 0.000000 0.000000 -26.493872 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 5.426257 -0.063351 -72.764786 14.895887 -8.910192 -78.025719 -8.868069 4.677484 54.319660 13.445259 9.539998 -6.550358 -2.556093 -0.063351 78.047836 -1.662631 -16.897179 52.338619 6.003851 7.530158 -45.906643 24.651121 -5.365809 -5.667846 4.505913 -0.083518 25.719715 -3.914847 -1.639442 -15.994658 1.154076 -0.599729 -5.659129 -4.567969 0.318305 25.667036 3.887340 1.552257 -16.056664 -1.867930 0.361574
+-0.064574 42.066433 1.190166 -4.392666 0.000000 0.000000 -9.894302 0.000000 0.000000 -5.277878 0.000000 0.000000 0.000000 0.000000 0.000000 -8.958424 0.000000 0.000000 -26.282333 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 1.355778 -0.063351 -70.944344 15.904198 -10.105499 -78.868034 -8.255120 5.323981 53.555096 12.369815 9.983183 -6.547013 2.964453 -0.063351 74.315033 -2.243142 -19.705952 52.983349 5.715093 7.926619 -44.149513 27.218054 -4.316176 -2.323274 4.238793 -0.075857 18.988474 -3.612152 -0.929089 -12.573203 1.061211 -0.849959 -2.317297 -4.366978 0.326529 18.944445 3.592086 0.864305 -12.617344 -1.807977 0.659470
+-0.048218 42.564243 1.261772 -4.457088 0.000000 0.000000 -9.873810 0.000000 0.000000 -4.888009 0.000000 0.000000 0.000000 0.000000 0.000000 -7.598831 0.000000 0.000000 -25.777336 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 3.281539 -0.063351 -73.243103 15.283265 -8.653548 -74.686752 -8.452563 5.451182 55.047863 10.242397 7.242273 -6.543668 -0.140314 -0.063351 76.428825 1.052016 -18.030436 42.515423 5.246356 8.247622 -49.649998 31.958920 -11.302148 2.156603 3.878883 -0.075505 9.905528 -3.060993 -0.048762 -7.918304 0.898100 -1.187966 2.176907 -4.075018 0.355699 9.828784 3.050699 -0.015488 -7.938670 -1.689040 1.045151
+-0.029345 42.437305 1.261298 -4.521509 0.000000 0.000000 -9.853317 0.000000 0.000000 -4.498139 0.000000 0.000000 0.000000 0.000000 0.000000 -6.295328 0.000000 0.000000 -24.827204 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 5.207301 -0.063351 -75.156425 14.515069 -7.684229 -73.263397 -8.744649 5.256796 56.148338 10.069470 6.631312 -6.540322 -3.245080 -0.063351 78.732925 3.908364 -16.541063 35.918423 4.951295 8.284132 -53.696949 33.951374 -16.012579 0.994103 3.947400 -0.065610 12.533913 -3.238227 -0.274822 -9.309548 0.929917 -1.057137 0.988343 -4.203875 0.361600 12.506721 3.233813 0.214022 -9.366233 -1.720100 0.962618
+-0.010471 42.310364 1.260823 -4.585930 0.000000 0.000000 -9.832826 0.000000 0.000000 -4.108270 0.000000 0.000000 0.000000 0.000000 0.000000 -5.125378 0.000000 0.000000 -23.280262 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 7.133062 -0.063351 -77.068413 13.813162 -6.764139 -72.062439 -9.083624 5.011234 57.226109 9.985825 6.131007 -6.536977 -6.349847 -0.063351 81.172508 7.640952 -15.581149 27.792156 4.432294 8.364022 -58.025898 36.465702 -21.424824 -0.088025 4.014706 -0.060327 14.975178 -3.405446 -0.486141 -10.602251 0.953277 -0.927269 -0.082748 -4.317180 0.356227 14.920797 3.387154 0.431403 -10.641535 -1.740115 0.902574
+-0.000059 42.226536 1.240029 -4.629035 0.000000 0.000000 -9.530519 0.000000 0.000000 -3.427521 0.000000 0.000000 0.000000 0.000000 0.000000 -4.148894 0.000000 0.000000 -21.046062 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 7.822575 -0.063351 -78.578697 12.978272 -6.373674 -70.743340 -9.150819 5.026340 56.262901 10.443878 5.928175 -6.388217 -7.728433 -0.063351 82.353432 9.127306 -15.634355 24.439592 4.298427 8.252342 -58.693939 35.459377 -23.690161 -0.762837 4.054327 -0.062634 16.464476 -3.495228 -0.638229 -11.363793 0.989769 -0.848890 -0.761346 -4.385308 0.368034 16.410471 3.474685 0.583524 -11.408405 -1.769163 0.858476
+0.003976 42.163296 1.183717 -4.645460 0.000000 0.000000 -8.746253 0.000000 0.000000 -2.138936 0.000000 0.000000 0.000000 0.000000 0.000000 -3.355600 0.000000 0.000000 -18.279045 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 7.229994 -0.063351 -80.042618 11.876647 -6.325692 -69.135857 -8.903775 5.270208 52.342037 11.615876 5.958009 -5.995378 -7.487085 -0.063351 82.460655 6.896979 -16.554033 28.370316 5.069789 7.740608 -54.242554 29.100800 -21.510141 -1.374787 4.077956 -0.068097 17.591316 -3.531718 -0.799823 -11.877561 1.057030 -0.798281 -1.361035 -4.425691 0.365816 17.517136 3.517079 0.714531 -11.896008 -1.811998 0.826854
+0.003291 42.117409 1.099925 -4.610812 0.000000 0.000000 -7.617898 0.000000 0.000000 -0.495805 0.000000 0.000000 0.000000 0.000000 0.000000 -2.717669 0.000000 0.000000 -15.194876 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 5.696598 -0.063351 -81.163399 10.546571 -6.361532 -67.055580 -8.518664 5.575134 46.284363 12.495501 5.681299 -5.431094 -6.045873 -0.063351 81.653679 2.928670 -17.807177 35.404991 6.374581 6.811089 -47.623970 19.404226 -18.207167 -1.886052 4.087621 -0.088822 18.323500 -3.544257 -0.911298 -12.124340 1.147759 -0.766871 -1.868510 -4.430041 0.358484 18.251333 3.517048 0.833862 -12.153376 -1.874420 0.796685
+-0.000452 42.085640 0.996693 -4.500701 0.000000 0.000000 -6.283329 0.000000 0.000000 1.248582 0.000000 0.000000 0.000000 0.000000 0.000000 -2.207275 0.000000 0.000000 -12.009220 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 3.563670 -0.063351 -81.751434 9.042018 -6.334008 -64.231522 -8.112700 5.816295 39.006443 12.038619 4.943166 -4.767998 -3.824865 -0.063351 79.777077 -0.181608 -18.820112 39.736309 7.578027 5.821647 -40.280064 9.615594 -16.715628 -2.413541 4.088757 -0.099104 18.800671 -3.529770 -1.020628 -12.185948 1.221503 -0.748685 -2.383358 -4.422973 0.351608 18.710257 3.502445 0.893052 -12.208519 -1.901660 0.792741
+-0.005595 42.064751 0.882059 -4.290738 0.000000 0.000000 -4.880417 0.000000 0.000000 2.840936 0.000000 0.000000 0.000000 0.000000 0.000000 -1.796593 0.000000 0.000000 -8.937745 0.000000 0.000000 0.000000 0.000000 0.000000 2.021919 1.172491 -0.063351 -81.608818 7.803810 -5.963276 -61.219254 -7.827922 5.807484 31.785873 10.321487 4.186516 -4.078727 -1.244130 -0.063351 77.510956 -4.820436 -18.992514 46.186718 9.209272 4.274374 -31.996973 -0.608961 -15.381668 -2.943489 4.092400 -0.089391 19.019690 -3.517758 -1.082615 -12.074724 1.253679 -0.756163 -2.918652 -4.410620 0.343356 18.930344 3.486148 0.945239 -12.115583 -1.927100 0.791770
+-0.010477 42.051506 0.764063 -3.956529 0.000000 0.000000 -3.547035 0.000000 0.000000 4.027970 0.000000 0.000000 0.000000 0.000000 0.000000 -1.457797 0.000000 0.000000 -6.196116 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -1.135659 -0.063351 -80.587616 7.020977 -4.940019 -57.646339 -7.711444 5.552536 25.634993 7.765310 3.362354 -3.435913 1.276267 -0.063351 74.831856 -9.077783 -17.883993 50.665668 10.709750 2.613109 -23.474848 -8.188107 -15.064377 -3.576439 4.101742 -0.085941 19.098352 -3.512694 -1.135999 -11.844551 1.294394 -0.764340 -3.537713 -4.403750 0.313429 18.982590 3.469481 0.955938 -11.863827 -1.892712 0.789915
+-0.013440 42.042671 0.650744 -3.473685 0.000000 0.000000 -2.421053 0.000000 0.000000 4.556392 0.000000 0.000000 0.000000 0.000000 0.000000 -1.163060 0.000000 0.000000 -4.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -3.019496 -0.063351 -78.656342 7.308135 -2.889171 -54.169006 -7.895879 4.870312 21.189783 5.759765 2.435808 -2.912189 3.316253 -0.063351 71.967613 -12.400178 -14.907135 52.060234 11.899405 1.169561 -16.103291 -11.837284 -14.678917 -4.253779 4.103047 -0.070999 18.970802 -3.504003 -1.125819 -11.521456 1.283793 -0.778843 -4.222915 -4.397578 0.290429 18.884289 3.465841 0.938866 -11.572247 -1.859947 0.798150
+-0.013293 42.035515 0.548574 -2.834001 0.000000 0.000000 -1.602520 0.000000 0.000000 4.265279 0.000000 0.000000 0.000000 0.000000 0.000000 -0.889547 0.000000 0.000000 -2.495058 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -4.230233 -0.063351 -75.983910 8.799534 0.393814 -50.609249 -8.433075 3.740946 18.332743 5.169167 1.235682 -2.559389 4.568424 -0.063351 69.362045 -14.608697 -9.658470 50.558189 12.699251 0.078041 -11.611548 -12.262603 -12.908319 -5.109320 4.104000 -0.050170 18.823027 -3.495441 -1.124045 -11.158753 1.275256 -0.783764 -5.069554 -4.396275 0.262181 18.707500 3.456779 0.915574 -11.174158 -1.812513 0.809080
+-0.010840 42.029270 0.456829 -2.096627 0.000000 0.000000 -1.024501 0.000000 0.000000 3.392304 0.000000 0.000000 0.000000 0.000000 0.000000 -0.632456 0.000000 0.000000 -1.513830 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -4.920807 -0.063351 -73.181206 10.430400 4.479538 -45.974682 -9.194269 2.430282 15.894939 5.056813 0.052438 -2.337930 5.212527 -0.063351 67.436684 -15.343998 -2.904442 46.442276 13.003711 -0.524894 -9.455560 -10.667912 -9.974939 -5.977130 4.092051 -0.009256 18.548101 -3.473807 -1.121293 -10.750093 1.238024 -0.782111 -5.966347 -4.394824 0.221579 18.452368 3.441279 0.885969 -10.767031 -1.759686 0.810876
+-0.007205 42.023731 0.373854 -1.330243 0.000000 0.000000 -0.597601 0.000000 0.000000 2.229369 0.000000 0.000000 0.000000 0.000000 0.000000 -0.392929 0.000000 0.000000 -0.852425 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.303185 -0.063351 -70.871101 11.397265 8.846531 -39.760216 -9.906818 1.233521 13.091832 4.491486 -0.694976 -2.195860 5.501784 -0.063351 66.815041 -14.394144 4.226499 39.660648 12.572942 -0.574079 -8.333131 -7.686528 -6.470807 -6.864823 4.072208 0.043046 18.177980 -3.434505 -1.080218 -10.264533 1.185445 -0.791978 -6.840171 -4.391986 0.172963 18.090963 3.406984 0.856124 -10.281682 -1.700863 0.833527
+-0.003299 42.018837 0.299737 -0.599395 0.000000 0.000000 -0.260871 0.000000 0.000000 1.016886 0.000000 0.000000 0.000000 0.000000 0.000000 -0.175712 0.000000 0.000000 -0.366772 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.532084 -0.063351 -69.853188 10.918552 12.875245 -31.116003 -10.027906 0.469564 9.596578 2.492758 -0.718309 -2.096038 5.623736 -0.063351 67.905594 -12.161057 10.772432 30.837112 11.192400 -0.195607 -7.238530 -3.721820 -2.918936 -7.315366 4.023886 0.088284 16.927946 -3.367673 -0.965741 -9.280494 1.106962 -0.837934 -7.045607 -4.352853 0.136649 16.800970 3.342962 0.729927 -9.509669 -1.638062 0.879571
+0.000000 42.014908 0.240040 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 2.021920 -5.690310 -0.063351 -70.100075 9.898806 15.947086 -22.679041 -9.378357 0.076935 5.966734 0.027484 0.177213 -2.021920 5.690310 -0.063351 70.025291 -9.978496 15.899026 22.669645 9.345270 0.121616 -5.927727 -0.009578 0.195807 -7.544928 3.982114 0.126592 15.855997 -3.300727 -0.855127 -8.588077 1.056593 -0.877759 -7.531943 -4.331991 0.100592 15.798183 3.280715 0.615038 -8.629052 -1.569328 0.946211
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 23:35:23
|
Revision: 410
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=410&view=rev
Author: trevorolio
Date: 2007-09-17 16:35:27 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Refactored the way user animations are referenced so as to reduce duplicate code and allow for easy addition.
Now avatars can /wave /clap /point and /laugh in addition to the usual standing and walking animations.
Modified Paths:
--------------
maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
Modified: maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java 2007-09-17 22:39:50 UTC (rev 409)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java 2007-09-17 23:35:27 UTC (rev 410)
@@ -58,13 +58,12 @@
import com.ogoglio.client.model.User;
import com.ogoglio.client.model.Space.Context;
import com.ogoglio.util.BodyConstants;
-import com.ogoglio.viewer.render.UIConstants;
import com.ogoglio.viewer.j3d.J3DCamera;
import com.ogoglio.viewer.j3d.J3DCanvas;
import com.ogoglio.viewer.j3d.J3DUniverse;
import com.ogoglio.viewer.j3d.J3DUserRenderable;
-import com.ogoglio.viewer.j3d.bvh.Bvh;
import com.ogoglio.viewer.j3d.bvh.BvhParser;
+import com.ogoglio.viewer.render.UIConstants;
import com.ogoglio.xml.AccountDocument;
import com.ogoglio.xml.BodyDocument;
@@ -124,14 +123,7 @@
}
public InputStream getUserAnimationStream(String username, long animationID) throws IOException {
- if (animationID == 1) {
- return UIConstants.getResource("avatar/avatar.bvh");
- } else if (animationID == 2) {
- return UIConstants.getResource("avatar/avatar-walk.bvh");
- } else if (animationID == 3) {
- return UIConstants.getResource("avatar/avatar-wave.bvh");
- }
- return null;
+ return UIConstants.getUserAnimation((int) animationID);
}
public InputStream getUserSkinMapStream(String username) throws IOException {
@@ -199,11 +191,8 @@
public boolean addUserRenderable() {
try {
- renderable = new J3DUserRenderable(user, true, new BvhParser(user, 1).parse());
+ renderable = new J3DUserRenderable(user, true, new BvhParser(user, 0).parse());
userGroup.addChild(renderable);
- BvhParser bvhParser = new BvhParser(user, 1);
- Bvh bvh = bvhParser.parse();
- renderable.playAnimation(bvh, false);
return true;
} catch (Exception e) {
e.printStackTrace();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 22:39:47
|
Revision: 409
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=409&view=rev
Author: trevorolio
Date: 2007-09-17 15:39:50 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
A handy test window for the body editor applet
Added Paths:
-----------
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java
Added: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java (rev 0)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/BodyAppletTestWindow.java 2007-09-17 22:39:50 UTC (rev 409)
@@ -0,0 +1,155 @@
+/* Copyright 2007 Transmutable (http://transmutable.com/)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
+
+package com.ogoglio.client.test;
+
+import java.applet.AppletContext;
+import java.applet.AppletStub;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashMap;
+
+import com.ogoglio.bodyeditor.BodyEditorApplet;
+import com.ogoglio.client.WebAPIAuthenticator;
+import com.ogoglio.client.WebAPIClientWire;
+import com.ogoglio.client.WebAPIDescriptor;
+import com.ogoglio.util.ArgumentUtils;
+import com.ogoglio.util.PropStorage;
+
+public class BodyAppletTestWindow extends Frame {
+
+ Dimension appDimension = new Dimension(500, 500);
+
+ public BodyEditorApplet applet = null;
+
+ EnvironmentStub clientStub1 = null;
+
+ URI serviceURI = null;
+
+ public BodyAppletTestWindow(URI serviceURI, String authCookie, Dimension appDimension, boolean decorated) {
+ ArgumentUtils.assertNotNull(appDimension);
+ this.appDimension = appDimension;
+ ArgumentUtils.assertNotNull(serviceURI);
+ this.serviceURI = serviceURI;
+
+ setLayout(new BorderLayout());
+ setSize(appDimension);
+ setLocation(30, 50);
+ setResizable(false);
+ if (!decorated) {
+ this.setUndecorated(true);
+ }
+ HashMap parameters1 = new HashMap();
+ parameters1.put("loginCookie", authCookie);
+ parameters1.put("serviceURI", serviceURI.toString());
+
+ clientStub1 = new EnvironmentStub(parameters1);
+ applet = new BodyEditorApplet();
+ applet.setStub(clientStub1);
+ add(applet, BorderLayout.CENTER);
+ }
+
+ private class EnvironmentStub implements AppletStub {
+
+ HashMap parameters = null;
+
+ public EnvironmentStub(HashMap parameters) {
+ this.parameters = parameters;
+ }
+
+ public void appletResize(int width, int height) {
+ }
+
+ public AppletContext getAppletContext() {
+ return null;
+ }
+
+ public URL getCodeBase() {
+ try {
+ return serviceURI.toURL();
+ } catch (MalformedURLException e) {
+ throw new IllegalStateException("Could not convert serviceURI to URL: " + serviceURI);
+ }
+ }
+
+ public URL getDocumentBase() {
+ try {
+ return serviceURI.toURL();
+ } catch (MalformedURLException e) {
+ throw new IllegalStateException("Could not convert serviceURI to URL: " + serviceURI);
+ }
+ }
+
+ public String getParameter(String name) {
+ return (String) parameters.get(name);
+ }
+
+ public boolean isActive() {
+ return true;
+ }
+
+ }
+
+ public void start() {
+ applet.init();
+ applet.start();
+ }
+
+ public void cleanup(){
+ applet.destroy();
+ }
+
+ public static void main(String[] args) {
+ GraphicsEnvironment graphicsEnv = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ GraphicsDevice device = graphicsEnv.getDefaultScreenDevice();
+ Dimension dim = new Dimension(1024, 800);
+ boolean fullScreen = args.length > 0 && "fullscreen".equals(args[0]);
+ if (fullScreen) {
+ dim = new Dimension(device.getDisplayMode().getWidth(), device.getDisplayMode().getWidth());
+ }
+ String serviceURI=null;
+ String loginCookie=null;
+ try {
+ PropStorage ps=new PropStorage();
+ ps.loadPropertySet(PropStorage.BASIC_PROPS);
+ serviceURI = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseUrl");
+ ps.loadPropertySet(PropStorage.BOOTSTRAP_PROPS);
+ WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), new WebAPIDescriptor(new URI(serviceURI)), ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUser"), ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUserPW"));
+ loginCookie = authenticator.getAuthCookie();
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.exit(1);
+ }
+
+ try {
+ BodyAppletTestWindow test = new BodyAppletTestWindow(new URI(serviceURI), loginCookie, dim, fullScreen);
+ test.setVisible(true);
+ if (fullScreen) {
+ device.setFullScreenWindow(test);
+ }
+ test.start();
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 22:39:05
|
Revision: 408
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=408&view=rev
Author: trevorolio
Date: 2007-09-17 15:39:06 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Other Mike Rig.
Added Paths:
-----------
spaces/trunk/art/Mike/MikeRigged-Wave.blend
Added: spaces/trunk/art/Mike/MikeRigged-Wave.blend
===================================================================
(Binary files differ)
Property changes on: spaces/trunk/art/Mike/MikeRigged-Wave.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 22:38:16
|
Revision: 407
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=407&view=rev
Author: trevorolio
Date: 2007-09-17 15:38:20 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Rewhacked Mike avatar to take a commonly available BVH style, so now he can walk, wave, and point.
Haven't tested it with the other two Croquet models yet, but it might Just Work. (famous last words)
Added Paths:
-----------
maven/trunk/ogoglio/src/main/resources/scripts/testBodyEditor.sh
Added: maven/trunk/ogoglio/src/main/resources/scripts/testBodyEditor.sh
===================================================================
--- maven/trunk/ogoglio/src/main/resources/scripts/testBodyEditor.sh (rev 0)
+++ maven/trunk/ogoglio/src/main/resources/scripts/testBodyEditor.sh 2007-09-17 22:38:20 UTC (rev 407)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# assumes you are in the dir with this script
+# assumes everything is built in other directories
+
+INT_TEST=../../../../../ogoglio-integration-test/target/test-classes
+COMMON=../../../../../ogoglio-common/target/ogoglio-common-0.0.1-SNAPSHOT.jar
+LIVEC=~/.m2/repository/netscape/liveConnect/1.0/liveConnect-1.0.jar
+APPLET=../../../../../ogoglio-body-editor-applet/target/ogoglio-body-editor-applet-0.0.1-SNAPSHOT.jar
+
+java -classpath $INT_TEST\:$COMMON\:$LIVEC\:$APPLET com.ogoglio.client.test.BodyAppletTestWindow
Property changes on: maven/trunk/ogoglio/src/main/resources/scripts/testBodyEditor.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 22:38:13
|
Revision: 406
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=406&view=rev
Author: trevorolio
Date: 2007-09-17 15:38:17 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Rewhacked Mike avatar to take a commonly available BVH style, so now he can walk, wave, and point.
Haven't tested it with the other two Croquet models yet, but it might Just Work. (famous last words)
Modified Paths:
--------------
maven/trunk/ogoglio-integration-test/pom.xml
Modified: maven/trunk/ogoglio-integration-test/pom.xml
===================================================================
--- maven/trunk/ogoglio-integration-test/pom.xml 2007-09-17 22:38:14 UTC (rev 405)
+++ maven/trunk/ogoglio-integration-test/pom.xml 2007-09-17 22:38:17 UTC (rev 406)
@@ -166,6 +166,11 @@
<artifactId>ogoglio-viewer-applet</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio-body-editor-applet</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 22:38:10
|
Revision: 405
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=405&view=rev
Author: trevorolio
Date: 2007-09-17 15:38:14 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Rewhacked Mike avatar to take a commonly available BVH style, so now he can walk, wave, and point.
Haven't tested it with the other two Croquet models yet, but it might Just Work. (famous last words)
Modified Paths:
--------------
spaces/trunk/art/Mike/MikeRigged.blend
Modified: spaces/trunk/art/Mike/MikeRigged.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 22:37:59
|
Revision: 404
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=404&view=rev
Author: trevorolio
Date: 2007-09-17 15:38:01 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Rewhacked Mike avatar to take a commonly available BVH style, so now he can walk, wave, and point.
Haven't tested it with the other two Croquet models yet, but it might Just Work. (famous last words)
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DSplinePath.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/BodyAnimator.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skeleton.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skin.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-point.bvh
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-walk.bvh
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-wave.bvh
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar.bvh
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar.obj
maven/trunk/ogoglio-common/src/main/resources/avatar/avatar.smap
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -145,7 +145,7 @@
} else if(lastSpun) {
userPosition.set(user.getPosition());
userPosition.rotY(random.nextFloat() % (2 * Math.PI));
- SplinePath path = J3DSplinePath.getSplinePath(userPosition, 1, 0, 0);
+ SplinePath path = J3DSplinePath.getSplinePath(userPosition, 1, 0, 0, 2);
robot.spaceClient.viewpointMotionChanged(path);
try {
sleep(3000 + Math.abs((random.nextInt() % 6000)));
@@ -154,7 +154,7 @@
}
lastSpun = false;
} else {
- SplinePath path = J3DSplinePath.getSplinePath(user.getPosition(), 0, 1, 0);
+ SplinePath path = J3DSplinePath.getSplinePath(user.getPosition(), 0, 1, 0, 2);
robot.spaceClient.viewpointMotionChanged(path);
try {
sleep(1000 + Math.abs((random.nextInt() % 6000)));
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/Space.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -118,7 +118,6 @@
Arrays.sort(things, new DistanceComparator());
if (things.length > 0) {
- Log.info("Adding " + things[0].getName());
listener.thingAdded(things[0]);
}
@@ -128,7 +127,6 @@
}
for (int i = 1; i < things.length; i++) {
- Log.info("Adding " + things[i].getName());
listener.thingAdded(things[i]);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DRenderer.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -48,7 +48,9 @@
import com.ogoglio.client.model.Thing;
import com.ogoglio.client.model.User;
import com.ogoglio.util.Log;
+import com.ogoglio.viewer.j3d.bvh.Bvh;
import com.ogoglio.viewer.j3d.bvh.BvhParseException;
+import com.ogoglio.viewer.j3d.bvh.BvhParser;
import com.ogoglio.viewer.j3d.obj.Obj;
import com.ogoglio.viewer.j3d.obj.ObjParseException;
import com.ogoglio.viewer.j3d.obj.ObjParser;
@@ -109,7 +111,7 @@
private J3DWater water = null;
private boolean rendererStopped = false;
-
+
private boolean completedInitialLoad = false;
public J3DRenderer(SpaceClient spaceClient, boolean offScreen) {
@@ -239,7 +241,7 @@
private class SpaceListener implements Space.Listener {
public void pageMoved(Page page, Transform3D position) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
J3DThingRenderable thingRenderable = (J3DThingRenderable) getThingRenderable(page.getThing().getThingID());
@@ -256,7 +258,7 @@
}
public void pageAdded(Page page) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
J3DThingRenderable thingRenderable = (J3DThingRenderable) getThingRenderable(page.getThing().getThingID());
@@ -280,7 +282,7 @@
}
public void pageContentChanged(Page page) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
J3DThingRenderable thingRenderable = (J3DThingRenderable) getThingRenderable(page.getThing().getThingID());
@@ -301,7 +303,7 @@
}
public void thingAdded(Thing thing) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
try {
@@ -327,7 +329,7 @@
}
public void thingMotionStarted(Thing thing, SplinePath path) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
ThingRenderable renderable = getThingRenderable(thing.getThingID());
@@ -343,7 +345,7 @@
}
public void thingReloaded(Thing thing) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
try {
@@ -386,7 +388,7 @@
}
public void userAdded(User user) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
try {
@@ -404,7 +406,7 @@
}
public void userMotionStarted(User user, SplinePath path) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
J3DUserRenderable renderable = (J3DUserRenderable) getUserRenderable(user.getUsername());
@@ -412,7 +414,6 @@
return;
}
startRenderableMotion(renderable, path);
- /* turn off walking until we have a good animation
if (!offScreen) {
try {
BvhParser bvhParser = new BvhParser(user, 2);
@@ -424,7 +425,6 @@
e.printStackTrace();
}
}
- */
}
public void userMotionStopped(User user, Transform3D position) {
@@ -437,14 +437,13 @@
}
public void userAnimationStarted(User user, long animationID) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
J3DUserRenderable renderable = (J3DUserRenderable) getUserRenderable(user.getUsername());
if (renderable == null) { //haven't loaded the renderable
return;
}
- /*
if (!offScreen) {
try {
BvhParser bvhParser = new BvhParser(user, animationID);
@@ -456,7 +455,6 @@
e.printStackTrace();
}
}
- */
}
public void userRemoved(User user) {
@@ -465,7 +463,7 @@
}
public void doorMotionStarted(Door door, SplinePath path) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
DoorRenderable renderable = getDoorRenderable(door.getDoorID());
@@ -478,7 +476,7 @@
}
public void doorAdded(Door door) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
try {
@@ -499,7 +497,7 @@
}
public void shapeMotionStarted(Shape shape, SplinePath path) {
- if(rendererStopped) {
+ if (rendererStopped) {
return;
}
J3DThingRenderable renderable = (J3DThingRenderable) getThingRenderable(shape.getThing().getThingID());
@@ -531,10 +529,10 @@
}
public void stopRenderer() {
- rendererStopped = true;
+ rendererStopped = true;
physicsBehavior.cleanup();
universe.removeAllLocales();
- if(!offScreen) {
+ if (!offScreen) {
canvas.stopRenderer();
Log.info("Stopped renderer");
}
@@ -598,8 +596,8 @@
}
return (UserRenderable[]) results.toArray(new UserRenderable[0]);
}
- */
-
+ */
+
private void removeUserRenderable(UserRenderable renderable) {
if (renderable == null) {
Log.error("User renderable == null");
@@ -649,11 +647,13 @@
private UserRenderable createUserRenderable(User user) throws IOException, RenderableParseException {
try {
boolean isLocalUser = !offScreen && username != null && user.getUsername().equals(username);
- final J3DUserRenderable renderable = new J3DUserRenderable(user, !offScreen && !isLocalUser);
+ Bvh defaultBvh = new BvhParser(user, 1).parse();
+ final J3DUserRenderable renderable = new J3DUserRenderable(user, !offScreen && !isLocalUser, defaultBvh);
renderable.setID(USER_ID_PREFIX + user.getUsername());
if (isLocalUser) {
- camera.setLocation(new Vector3f(0f, 2f, 0f));
+ float cameraHeight = (float) (renderable.getHeight() - renderable.getHeight() / 5);
+ camera.setLocation(new Vector3f(0f, cameraHeight, 0f));
renderable.setCamera(camera);
motionHandler = new MotionInputHandler(this, renderable, userInputListener);
@@ -667,13 +667,6 @@
renderable.setNameTag(displayName);
}
- /*
- if (!offScreen) {
- BvhParser bvhParser = new BvhParser(user, 1);
- Bvh bvh = bvhParser.parse();
- renderable.playAnimation(bvh, false);
- }
- */
return renderable;
} catch (BvhParseException e) {
e.printStackTrace();
@@ -719,7 +712,7 @@
Obj[] objs = new Obj[GeometryProvider.LOD_DISTANCES.length + 1];
for (int i = 0; i < objs.length; i++) {
objs[i] = getObj(thing, i);
- if(objs[i] != null && objs[i].getGroups().length == 0) {
+ if (objs[i] != null && objs[i].getGroups().length == 0) {
Log.error("Got obj with no groups for thing " + thing.getThingID() + ": " + thing.getName());
objs[i] = null;
}
@@ -769,7 +762,7 @@
lightD1.setInfluencingBounds(DEFAULT_SPACE_BOUNDS);
sceneRoot.addChild(lightD1);
}
- */
+ */
public Canvas getCanvas() {
return canvas;
}
@@ -829,7 +822,7 @@
public double getLandHeight(double x, double z, double pickHeight) {
pickStart.set(x, pickHeight, z);
if (picker.pickRayClosest(pickStart, DOWN_VEC, intersectionPoint) == null) {
- //System.out.println("no land height: 0!");
+ //System.out.println("no land height: 0!");
return 0;
}
//System.out.println("intersected with land: "+intersectionPoint.y);
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DSplinePath.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DSplinePath.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DSplinePath.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -56,7 +56,7 @@
* @param forwardSpeed between -1 and 1
* @param turn between -1 and 1
*/
- public static SplinePath getSplinePath(Transform3D startPosition, float forwardSpeed, float turn, float strafeSpeed) {
+ public static SplinePath getSplinePath(Transform3D startPosition, float forwardSpeed, float turn, float strafeSpeed, float userHeight) {
Vector3f[] positions = null;
Vector3f[] headings = null;
long duration = 0;
@@ -142,7 +142,7 @@
float knotValue = i == positions.length - 1 ? 1 : i * (1f / positions.length);
keyFrames[i] = new J3DSplineKeyFrame(knotValue, false, new Point3f(positions[i]), headings[i].x, headings[i].y, headings[i].z, scale, -1f, 0f, 0f);
}
- return new J3DSplinePath(keyFrames, duration, looping, true, 0.02);
+ return new J3DSplinePath(keyFrames, duration, looping, true, 0);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/J3DUserRenderable.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -18,17 +18,17 @@
import java.io.IOException;
import javax.media.j3d.Billboard;
-import javax.media.j3d.BoundingBox;
+import javax.media.j3d.BoundingSphere;
import javax.media.j3d.BranchGroup;
import javax.media.j3d.Transform3D;
import javax.media.j3d.TransformGroup;
import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
import javax.vecmath.Vector3d;
import javax.vecmath.Vector3f;
import com.ogoglio.client.model.Body;
import com.ogoglio.client.model.User;
+import com.ogoglio.util.ArgumentUtils;
import com.ogoglio.viewer.j3d.body.BodyAnimator;
import com.ogoglio.viewer.j3d.body.Skeleton;
import com.ogoglio.viewer.j3d.body.SkeletonLoader;
@@ -49,6 +49,8 @@
public class J3DUserRenderable extends BranchGroup implements UserRenderable {
+ private static final float MAGIC_SKELETON_SCALE = 2.5f;
+
public static float PERSON_HEIGHT = 2f;
private TransformGroup transformGroup = new TransformGroup();
@@ -57,6 +59,8 @@
private User user = null;
+ private Bvh defaultAnimation = null;
+
private J3DCamera camera = null;
private Skin skin = null;
@@ -65,39 +69,48 @@
private SkinMap skinMap = null;
-// private double skinScale = 0;
+ private float skeletonScale = 1;
- private double skeletonScale = 0;
+ private BodyAnimator animator = null;
- private float skeletonYShift = 0;
+ private BodyAnimatorListener bodyAnimatorListener = new BodyAnimatorListener();
+
+ float userHeight = 2; //meters
- private BodyAnimator animator = null;
-
- public J3DUserRenderable(User user, boolean setVisible) throws IOException, ObjParseException, BvhParseException, SkinMapParseException {
+ public J3DUserRenderable(User user, boolean setVisible, Bvh defaultAnimation) throws IOException, ObjParseException, BvhParseException, SkinMapParseException {
+ ArgumentUtils.assertNotNull(user);
this.user = user;
- BvhParser bvhParser = new BvhParser(user, 1);
- Bvh bvh = bvhParser.parse();
- skeleton = new SkeletonLoader(bvh).generateSkeleton();
- //skeleton.addDebugAttachments();
-
+ ArgumentUtils.assertNotNull(defaultAnimation);
+ this.defaultAnimation = defaultAnimation;
+
if (setVisible) {
ObjParser parser = new ObjParser(user, 0);
parser.setIgnoreMaterialsFiles(true);
Obj obj = parser.parse();
skin = new SkinLoader(obj, user.getBody()).generateSkin();
-
+ userHeight = skin.getHeight();
+
SkinMapParser skinMapParser = new SkinMapParser(user);
skinMap = skinMapParser.parse();
+ }
+ scaleBVH(defaultAnimation);
+
+ skeleton = new SkeletonLoader(defaultAnimation).generateSkeleton();
+ //skeleton.addDebugAttachments();
+ if(setVisible){
skin.setSkeleton(skeleton, skinMap);
}
-
+
setCapability(BranchGroup.ALLOW_DETACH);
+ setCapability(BranchGroup.ALLOW_BOUNDS_READ);
setCapabilities(transformGroup);
addChild(transformGroup);
Transform3D rotationTransform = new Transform3D();
rotationTransform.rotY(Math.PI);
+ float hairHeight = defaultAnimation.getJointHeight("lFoot");
+ rotationTransform.setTranslation(new Vector3d(0, -1 * hairHeight, 0));
bodyGroup.setTransform(rotationTransform);
if (setVisible) {
bodyGroup.addChild(skin);
@@ -106,8 +119,17 @@
transformGroup.addChild(bodyGroup);
setPosition(user.getPosition());
+ playAnimation(defaultAnimation, false);
}
+ private void scaleBVH(Bvh bvh){
+ float bvhHeight = bvh.getHeight();
+ if(bvhHeight != userHeight){
+ skeletonScale = userHeight / bvhHeight / MAGIC_SKELETON_SCALE; //TODO figure out why we need this magic scale number
+ bvh.scale(skeletonScale);
+ }
+ }
+
public void setNameTag(String nameTag) {
TransformGroup nameGroup = new TransformGroup();
nameGroup.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
@@ -129,6 +151,7 @@
}
private void setCapabilities(TransformGroup group) {
+ group.setCapability(TransformGroup.ALLOW_BOUNDS_READ);
group.setCapability(TransformGroup.ALLOW_PICKABLE_READ);
group.setCapability(TransformGroup.ALLOW_TRANSFORM_READ);
group.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
@@ -235,24 +258,13 @@
return skeletonScale;
}
- public float getSkeletonYShift() {
- return skeletonYShift;
- }
-
public User getUser() {
return user;
}
-
+
public double getHeight() {
- if (skin == null) {
- return 2;
- }
- BoundingBox bounds = (BoundingBox) skin.getBounds();
- Point3d upper = new Point3d();
- bounds.getUpper(upper);
- Point3d lower = new Point3d();
- bounds.getLower(lower);
- return upper.y - lower.y;
+ BoundingSphere bounds = (BoundingSphere) getBounds();
+ return Math.abs(bounds.getRadius() * 2);
}
public void cleanup() {
@@ -272,14 +284,26 @@
animator.cleanup();
animator = null;
}
+ playAnimation(defaultAnimation, false);
}
+ private class BodyAnimatorListener implements BodyAnimator.Listener {
+ public void bodyAnimationCompleted(BodyAnimator animator) {
+ if(animator.getBvh() == defaultAnimation){
+ return;
+ }
+ playAnimation(defaultAnimation, false);
+ }
+ }
+
public synchronized void playAnimation(Bvh bvh, boolean loop) {
if (animator != null) {
animator.cleanup();
}
+
if (skeleton != null && bvh != null && skin != null) {
- animator = new BodyAnimator(skeleton, bvh, skin);
+ scaleBVH(bvh);
+ animator = new BodyAnimator(skeleton, bvh, skin, bodyAnimatorListener);
animator.animate(loop);
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/MotionInputHandler.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -64,7 +64,7 @@
private UserInputListener userInputListener = null;
- private UserRenderable userGroup = null;
+ private UserRenderable userRenderable = null;
public MotionInputHandler(Renderer renderer, UserRenderable userGroup, UserInputListener inputListener) {
ArgumentUtils.assertNotNull(renderer);
@@ -72,7 +72,7 @@
ArgumentUtils.assertNotNull(inputListener);
this.userInputListener = inputListener;
ArgumentUtils.assertNotNull(userGroup);
- this.userGroup = userGroup;
+ this.userRenderable = userGroup;
}
private synchronized void reevaluate() {
@@ -91,14 +91,14 @@
dirty = false;
Transform3D position = new Transform3D();
- userGroup.getPosition(position);
+ userRenderable.getPosition(position);
SplinePath path = null;
float turn = (turnLeft ? -1 : 0) + (turnRight ? 1 : 0);
float forwardSpeed = (moveForward ? 1 : 0) + (moveBackward ? -1 : 0);
float strafeSpeed = (strafeLeft ? 1 : 0) + (strafeRight ? -1 : 0);
if (turn != 0 || forwardSpeed != 0 || strafeSpeed != 0) {
- path = J3DSplinePath.getSplinePath(position, forwardSpeed, turn, strafeSpeed);
+ path = J3DSplinePath.getSplinePath(position, forwardSpeed, turn, strafeSpeed, (float)userRenderable.getHeight());
userInputListener.viewpointMotionChanged(path);
return;
} else {
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/BodyAnimator.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/BodyAnimator.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/BodyAnimator.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -42,17 +42,28 @@
private boolean loop = false;
private boolean cleaned = false;
-
- public BodyAnimator(Skeleton skeleton, Bvh bvh, Skin skin) {
+
+ private Listener listener = null;
+
+ public BodyAnimator(Skeleton skeleton, Bvh bvh, Skin skin, Listener listener) {
this.skeleton = skeleton;
this.bvh = bvh;
this.skin = skin;
+ this.listener = listener;
}
+ public static interface Listener {
+ public void bodyAnimationCompleted(BodyAnimator animator);
+ }
+
+ public Bvh getBvh(){
+ return bvh;
+ }
+
private void pose(int index) {
Joint joint = bvh.getRootJoint();
pose(joint, bvh.getFrame(index));
- if(cleaned) {
+ if (cleaned) {
return;
}
skin.pose();
@@ -60,7 +71,7 @@
private void pose(Bvh.Joint joint, Bvh.Frame frame) {
workingTransform.setIdentity();
- if(cleaned) {
+ if (cleaned) {
return;
}
Bone bone = skeleton.getRootBone().getBone(joint.getName());
@@ -80,6 +91,7 @@
frameIndex = 0;
} else {
cleanup();
+ listener.bodyAnimationCompleted(this);
return;
}
}
@@ -92,7 +104,7 @@
}
public synchronized void animate(boolean loop) {
- if(cleaned) {
+ if (cleaned) {
throw new IllegalStateException("Can only use a BodyAnimator once (for now)");
}
task.cancel();
@@ -104,11 +116,11 @@
private class AnimationTask extends TimerTask {
public void run() {
- if(cleaned) {
+ if (cleaned) {
cancel();
}
step();
- if(cleaned) {
+ if (cleaned) {
cancel();
}
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skeleton.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skeleton.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skeleton.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -98,7 +98,7 @@
}
public String toString() {
- return name;
+ return name + ":" + offset;
}
public Bone getParentBone() {
@@ -173,7 +173,7 @@
for (int i = 0; i < indent; i++) {
buffer.append("\t");
}
- Log.info(buffer.toString()+bone.getName());
+ Log.info(buffer.toString() + bone);
for (int i = 0; i < bone.getChildCount(); i++) {
print(bone.getChildBone(i), indent + 1);
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skin.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skin.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/body/Skin.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -19,6 +19,7 @@
import java.util.Vector;
import javax.media.j3d.Appearance;
+import javax.media.j3d.BoundingBox;
import javax.media.j3d.ColoringAttributes;
import javax.media.j3d.Geometry;
import javax.media.j3d.GeometryArray;
@@ -31,6 +32,7 @@
import javax.media.j3d.Texture;
import javax.media.j3d.TextureAttributes;
import javax.media.j3d.Transform3D;
+import javax.vecmath.Point3d;
import javax.vecmath.Point3f;
import javax.vecmath.Vector3d;
@@ -173,7 +175,6 @@
if (groups[i] != null) {
ranges[i] = groups[i].getRanges();
} else {
- Log.warn("No ranges for " + bones[i].getName());
ranges[i] = null;
}
lastTransforms[i] = new Transform3D();
@@ -266,4 +267,13 @@
}
}
+ public float getHeight() {
+ BoundingBox bounds = (BoundingBox)getBounds();
+ Point3d upper = new Point3d();
+ bounds.getUpper(upper);
+ Point3d lower = new Point3d();
+ bounds.getLower(lower);
+ return (float)(upper.y - lower.y);
+ }
+
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/viewer/j3d/bvh/Bvh.java 2007-09-17 22:38:01 UTC (rev 404)
@@ -107,6 +107,17 @@
//TODO stop ignoring scale
}
+ public void scaleFrameData(float amountToScale, Frame frame) {
+ if (startIndex == -1) {
+ return;
+ }
+ if (channelIndices[0] != -1 && channelIndices[1] != -1 && channelIndices[2] != -1) {
+ frame.data[startIndex + channelIndices[0]] = frame.data[startIndex + channelIndices[0]] * amountToScale;
+ frame.data[startIndex + channelIndices[1]] = frame.data[startIndex + channelIndices[1]] * amountToScale;
+ frame.data[startIndex + channelIndices[2]] = frame.data[startIndex + channelIndices[2]] * amountToScale;
+ }
+ }
+
public String getName() {
return name;
}
@@ -169,19 +180,84 @@
public Joint getRootJoint() {
return rootJoint;
}
-
+
+ public Joint getJointByName(String jointName) {
+ Vector joints = new Vector();
+ getJoints(getRootJoint(), joints);
+ for (int i = 0; i < joints.size(); i++) {
+ if (jointName.equals(((Joint) joints.get(i)).getName())) {
+ return (Joint) joints.get(i);
+ }
+ }
+ return null;
+ }
+
+ private void getJoints(Joint joint, Vector results) {
+ results.add(joint);
+ for (int i = 0; i < joint.getChildCount(); i++) {
+ getJoints(joint.getChild(i), results);
+ }
+ }
+
public void printJoint(Joint joint) {
printJoint(joint, 0);
}
-
+
private void printJoint(Joint joint, int offset) {
- StringBuffer buff=new StringBuffer();
+ StringBuffer buff = new StringBuffer();
for (int i = 0; i < offset; i++) {
buff.append("\t");
}
- Log.info(buff.toString()+joint.getName() + ": " + joint.getOffset());
+ Log.info(buff.toString() + joint.getName() + ": " + joint.getOffset());
for (int i = 0; i < joint.getChildCount(); i++) {
printJoint(joint.getChild(i), offset + 1);
}
}
+
+ public float getHeight() {
+ float minY = Float.MAX_VALUE;
+ float maxY = Float.MIN_VALUE;
+ Vector joints = new Vector();
+ getJoints(getRootJoint(), joints);
+ for (int i = 0; i < joints.size(); i++) {
+ Joint joint = (Joint) joints.get(i);
+ if (joint.getOffset().y < minY) {
+ minY = joint.getOffset().y;
+ }
+ if (joint.getOffset().y > maxY) {
+ maxY = joint.getOffset().y;
+ }
+ }
+ if (minY == Float.MAX_VALUE || maxY == Float.MIN_VALUE) {
+ return 0;
+ }
+ return maxY - minY;
+ }
+
+ public void scale(float amountToScale) {
+ Vector joints = new Vector();
+ getJoints(getRootJoint(), joints);
+ for (int i = 0; i < joints.size(); i++) {
+ Joint joint = (Joint) joints.get(i);
+ Vector3f offset = joint.getOffset();
+ joint.setOffset(offset.x * amountToScale, offset.y * amountToScale, offset.z * amountToScale);
+ for (int j = 0; j < getFrameCount(); j++) {
+ joint.scaleFrameData(amountToScale, getFrame(j));
+ }
+ }
+ }
+
+ public float getJointHeight(String jointName) {
+ Joint joint = getJointByName(jointName);
+ if(joint == null){
+ return 0;
+ }
+ float result = joint.getOffset().y;
+ Joint parent = joint.getParent();
+ while(parent != null){
+ result += parent.getOffset().y;
+ parent = parent.getParent();
+ }
+ return result;
+ }
}
Modified: maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-point.bvh
===================================================================
--- maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-point.bvh 2007-09-17 22:37:42 UTC (rev 403)
+++ maven/trunk/ogoglio-common/src/main/resources/avatar/avatar-point.bvh 2007-09-17 22:38:01 UTC (rev 404)
@@ -1,168 +1,184 @@
-HIERARCHY
-ROOT Neck
-{
- OFFSET 0.000000 1.413067 0.000000
- CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation
- JOINT Head
- {
- OFFSET 0.000000 0.288233 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- End Site
- {
- OFFSET -0.000840 0.240359 0.000000
- }
- }
- JOINT LeftShoulder
- {
- OFFSET 0.000000 0.000000 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT LeftArm
- {
- OFFSET 0.272146 0.057570 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT LeftForearm
- {
- OFFSET 0.272146 -0.073270 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- End Site
- {
- OFFSET 0.382052 -0.120372 0.000000
- }
- }
- }
- }
- JOINT Trunk
- {
- OFFSET 0.000000 0.000000 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT LeftHip
- {
- OFFSET 0.015701 -0.481489 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT LeftThigh
- {
- OFFSET 0.115208 -0.062803 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT LeftShin
- {
- OFFSET 0.007551 -0.350650 0.036635
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT LeftFoot
- {
- OFFSET -0.000000 -0.434387 -0.026168
- CHANNELS 3 Zrotation Xrotation Yrotation
- End Site
- {
- OFFSET 0.000000 -0.020934 0.225044
- }
- }
- }
- }
- }
- JOINT RightHip
- {
- OFFSET 0.015701 -0.481489 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT RightThigh
- {
- OFFSET -0.130840 -0.078504 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT RightShin
- {
- OFFSET -0.015701 -0.355884 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT RightFoot
- {
- OFFSET -0.015701 -0.392518 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- End Site
- {
- OFFSET 0.009601 -0.046108 0.244754
- }
- }
- }
- }
- }
- }
- JOINT RightShoulder
- {
- OFFSET 0.000000 0.000000 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT RightArm
- {
- OFFSET -0.240745 0.062803 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- JOINT RightForearm
- {
- OFFSET -0.277380 -0.073270 0.000000
- CHANNELS 3 Zrotation Xrotation Yrotation
- End Site
- {
- OFFSET -0.387286 -0.130840 0.000000
- }
- }
- }
- }
-}
-MOTION
-Frames: 59
-Frame Time: 0.040000
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 68.751213 -3.608197 9.332540 0.453265 0.000314 0.079923
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 68.625801 -4.314910 11.116751 0.450353 0.000380 0.095028
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 68.092926 -6.539802 16.567228 0.438296 0.000549 0.140530
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 66.647392 -10.548810 25.556679 0.408225 0.000779 0.212617
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 63.339909 -16.868151 37.157478 0.351043 0.000920 0.297681
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 56.742085 -26.435978 49.301502 0.268750 0.000888 0.373657
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 45.511955 -40.189003 59.314606 0.179440 0.000663 0.423851
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 30.843445 -56.701481 65.384270 0.105249 0.000413 0.448068
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 18.505310 -70.131149 67.844505 0.058994 0.000241 0.456470
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 13.933969 -75.057091 68.379097 0.043734 0.000168 0.458187
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 15.592641 -73.271828 68.205055 0.049190 0.000191 0.457633
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 20.462332 -68.015968 67.560570 0.065777 0.000262 0.455548
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 27.960419 -59.863308 66.116219 0.093563 0.000364 0.450658
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 36.834835 -50.061420 63.460114 0.132021 0.000510 0.440926
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 45.514332 -40.186401 59.312763 0.179461 0.000666 0.423845
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 52.840313 -31.417212 53.697868 0.232557 0.000818 0.397201
-0.000000 1.413067 0.000000 0.000000 0.000000 -0.000000 -0.000000 0.000000 0.000000 0.000001 -0.000002 0.000000 -69.566444 3.475644 9.382329 -0.000008 -0.000000 -0.000007 0.000000 0.000000 -0.000001 -0.000009 0.000002 0.000001 0.000009 -10.000010 0.000007 0.000005 0.000001 -0.000003 0.000002 9.999999 -0.000002 -0.000002 0.000000 -0.000000 0.000009 10.000000 0.000001 0.000002 -0.000000 0.000004 -0.000006 -9.999991 -0.000000 -0.000003 0.000000 0.000000 58.406048 -24.202238 46.952320 0.286579 0.0...
[truncated message content] |
|
From: <tre...@us...> - 2007-09-17 22:37:43
|
Revision: 403
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=403&view=rev
Author: trevorolio
Date: 2007-09-17 15:37:42 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Rewhacked Mike avatar to take a commonly available BVH style, so now he can walk, wave, and point.
Haven't tested it with the other two Croquet models yet, but it might Just Work. (famous last words)
Modified Paths:
--------------
maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
Modified: maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java
===================================================================
--- maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java 2007-09-17 16:05:11 UTC (rev 402)
+++ maven/trunk/ogoglio-body-editor-applet/src/main/java/com/ogoglio/bodyeditor/BodyEditorApplet.java 2007-09-17 22:37:42 UTC (rev 403)
@@ -63,6 +63,8 @@
import com.ogoglio.viewer.j3d.J3DCanvas;
import com.ogoglio.viewer.j3d.J3DUniverse;
import com.ogoglio.viewer.j3d.J3DUserRenderable;
+import com.ogoglio.viewer.j3d.bvh.Bvh;
+import com.ogoglio.viewer.j3d.bvh.BvhParser;
import com.ogoglio.xml.AccountDocument;
import com.ogoglio.xml.BodyDocument;
@@ -197,8 +199,11 @@
public boolean addUserRenderable() {
try {
- renderable = new J3DUserRenderable(user, true);
+ renderable = new J3DUserRenderable(user, true, new BvhParser(user, 1).parse());
userGroup.addChild(renderable);
+ BvhParser bvhParser = new BvhParser(user, 1);
+ Bvh bvh = bvhParser.parse();
+ renderable.playAnimation(bvh, false);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -238,7 +243,7 @@
canvas.getView().setSceneAntialiasingEnable(true);
camera.setRotation(-0.5, Math.PI, 0);
- camera.setLocation(new Vector3f(0f, 1.7f, -0.9f));
+ camera.setLocation(new Vector3f(0f, 0.8f, -1.9f));
sceneRoot.addChild(camera.getNode());
universe.makeLive();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-17 16:05:17
|
Revision: 402
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=402&view=rev
Author: trevorolio
Date: 2007-09-17 09:05:11 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Rigged the Mike Avatar to a walk animation
Added Paths:
-----------
spaces/trunk/art/Mike/MikeRigged.blend
Added: spaces/trunk/art/Mike/MikeRigged.blend
===================================================================
(Binary files differ)
Property changes on: spaces/trunk/art/Mike/MikeRigged.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-16 06:43:25
|
Revision: 401
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=401&view=rev
Author: trevorolio
Date: 2007-09-15 23:43:26 -0700 (Sat, 15 Sep 2007)
Log Message:
-----------
Update the contribute page of the Ogoglio web site to reflect the new location for documents.
Also added a pointer to the new build document.
Modified Paths:
--------------
web/trunk/contribute.html
Modified: web/trunk/contribute.html
===================================================================
--- web/trunk/contribute.html 2007-09-14 17:28:29 UTC (rev 400)
+++ web/trunk/contribute.html 2007-09-16 06:43:26 UTC (rev 401)
@@ -40,14 +40,13 @@
<div id="content">
<h2>Get the Platform:</h2>
<p>The Ogoglio platform core is licensed under the Apache 2 License.</p>
- <p>The best source for documentation is the <a href="ogmanual/index.html">server manual</a>.</p>
+ <p>The best source for documentation is the <a href="http://ogoglio.wiki.sourceforge.net/">wiki</a>.</p>
- <h3>Get the demo package:</h3>
- <p>We've packaged a snapshot of the platform along with Tomcat and all needed libraries. <a href="http://sourceforge.net/project/showfiles.php?group_id=184718">Download</a> it from sourceforge, unzip it, and the follow the quick instructions in README.txt.</p>
- <p>Keep in mind that the included HTML is not a finished space hosting platform but generic templates for web developers.</p>
+ <h3>Build your own server:</h3>
+ <p>Follow the instructions on the <a href="http://ogoglio.wiki.sourceforge.net/Ogoglio+Development+Tutorial">Ogoglio Development Tutorial</a> to check out the source code, build, and then boot a demonstration Ogoglio server</p>
- <h3>Or build from source:</h3>
- <p>The source code is available from the SVN repository of the <a href="http://sourceforge.net/projects/ogoglio">sourceforge project</a>, and build instructions are available in the <a href="http://ogoglio.com/ogmanual/installation.html">installation section</a> of the manual.</p>
+ <h3>Read the source:</h3>
+ <p>The source code is available from the SVN repository of the <a href="http://sourceforge.net/projects/ogoglio">sourceforge project</a>.</p>
<h3>Contributing code:</h3>
<p>If you're a builder, pick something interesting from the <a href="http://ogoglio.wiki.sourceforge.net/Worklist">worklist</a> and ping the current repository maintainer:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-14 17:28:26
|
Revision: 400
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=400&view=rev
Author: trevorolio
Date: 2007-09-14 10:28:29 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
Added a function to fetch the service state to ogoglio.js, so that apps can turn registration UIs on and off accordingly.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js 2007-09-13 21:02:37 UTC (rev 399)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js 2007-09-14 17:28:29 UTC (rev 400)
@@ -586,7 +586,12 @@
manager.send();
}
+// BEGIN SERVICE UTILS
+function requestServiceState(listener){
+ new XMLRequestManager(appPath + "/space/state/", new BasicHTTPListener(listener)).send();
+}
+
// BEGIN TEMPLATE UTILS
function requestTemplateList(username, listener){
new XMLRequestManager(appPath + "/account/" + username + "/template/", new BasicHTTPListener(listener)).send();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-13 21:02:34
|
Revision: 399
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=399&view=rev
Author: trevorolio
Date: 2007-09-13 14:02:37 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Added bodyless (disembodied?) POST to the scripting API.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java 2007-09-12 17:43:30 UTC (rev 398)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/script/ScriptHTTPRequest.java 2007-09-13 21:02:37 UTC (rev 399)
@@ -23,6 +23,7 @@
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.mozilla.javascript.Callable;
import org.mozilla.javascript.Context;
@@ -36,7 +37,7 @@
public class ScriptHTTPRequest extends ScriptableObject {
public static final String USER_AGENT = "Ogoglio Script Request v0.1";
-
+
private Callable callback = null; //An event handler for an event that fires at every state change.
private int stateCode = 0; //Returns the state of the object as follows: 0 = uninitialized, 1 = initialized, 2 = sent, 3 = receiving and 4 = completed
@@ -118,6 +119,9 @@
}
public void jsFunction_send(String content) { //Sends the request.
+ if(content != null && "undefined".equals(content)){
+ content = null;
+ }
startRequest(method, url, content);
}
@@ -149,8 +153,8 @@
try {
callback.call(context, this.getParentScope(), (Scriptable) callback, args);
} catch (EcmaError e) {
- if(scriptSpace != null) {
- scriptSpace.jsFunction_log("Error: " + e.getLocalizedMessage());
+ if (scriptSpace != null) {
+ scriptSpace.jsFunction_log("Error: " + e.getLocalizedMessage());
} else {
Log.error("UpdateState error: " + e.getLocalizedMessage());
}
@@ -205,13 +209,23 @@
public void run() {
if ("GET".equals(methodType)) {
method = new GetMethod(url);
- method.setFollowRedirects(false);
+ } else if ("POST".equals(methodType)) {
+ if (content != null && content.length() != 0) {
+ if (scriptSpace != null) {
+ scriptSpace.jsFunction_log("Error: haven't implemented POST with a body (" + content + ") yet. Sorry");
+ }
+ throw new IllegalStateException("Haven't implemented POST with a body (" + content + ") yet.");
+ }
+ method = new PostMethod(url);
} else {
//TODO handle method types other than GET
- Log.warn("Bad method: " + method);
- throw new IllegalStateException("Haven't implemented anything but GET yet. Sorry.");
+ if (scriptSpace != null) {
+ scriptSpace.jsFunction_log("Error: haven't implemented HTTP method " + methodType + " yet. Sorry");
+ }
+ throw new IllegalStateException("Unimplemented ScriptHTTPRequest method: " + method);
}
+ method.setFollowRedirects(false);
method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(1, false));
method.getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
try {
@@ -223,10 +237,10 @@
}
} catch (HttpException e) {
httpCode = 404;
- Log.error("Fatal protocol violation (HttpException) ",e);
+ Log.error("Fatal protocol violation (HttpException) ", e);
} catch (IOException e) {
httpCode = 404;
- Log.error("Fatal transport error (IOException) ",e);
+ Log.error("Fatal transport error (IOException) ", e);
} finally {
method.releaseConnection();
stateCode = 4;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-12 17:43:27
|
Revision: 398
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=398&view=rev
Author: iansmith
Date: 2007-09-12 10:43:30 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Fixed the build so it should always include the applets.
Integration tests now check that applets are present.
Modified Paths:
--------------
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-12 13:08:35 UTC (rev 397)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-12 17:43:30 UTC (rev 398)
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Date;
import java.util.Random;
@@ -102,9 +103,27 @@
}
public void tearDown() {
+ }
+ public void testAppletsCanBeDownloaded() throws IOException, URISyntaxException {
+ checkSupportFile("ogoglio-viewer-applet.jar");
+ checkSupportFile("ogoglio-test-applet.jar");
+ checkSupportFile("ogoglio-common.jar");
+ checkSupportFile("ogoglio-body-editor-applet.jar");
}
+ private void checkSupportFile(String name) throws URISyntaxException, IOException {
+ URI supportURI=new URI(serviceURI1.toString()+name);
+ InputStream is=null;
+ try {
+ is=wire1.performGET(supportURI, null);
+ } catch (IOException e) {
+ fail("unable to get the support URI:"+supportURI+" (exception:"+e.getMessage()+")");
+ }
+ assertNotNull(is);
+ is.close();
+ }
+
public void testWebAdmin() throws AuthenticationFailedException, IOException {
PropStorage ps = new PropStorage();
if (ps.loadPropertySet(PropStorage.BOOTSTRAP_PROPS) == false) {
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-12 13:08:35 UTC (rev 397)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-12 17:43:30 UTC (rev 398)
@@ -132,7 +132,7 @@
<executions>
<execution>
<id>copy-applets</id>
- <phase>package</phase>
+ <phase>test</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -140,7 +140,6 @@
<outputDirectory>
${project.build.directory}/${pom.artifactId}-${version}
</outputDirectory>
- <overwriteIfNewer>true</overwriteIfNewer>
<stripVersion>true</stripVersion>
<artifactItems>
<artifactItem>
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 13:08:35 UTC (rev 397)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 17:43:30 UTC (rev 398)
@@ -41,11 +41,11 @@
if (!(ourURI.equals(sim.getSimURI()))) {
//make it point to us
sim.setSimURI(ourURI);
- sim.setActive(true);
+ //sim.setActive(true);
SimPersistTasks.update(sim, sessionFactory);
} else {
if (!sim.isActive()) {
- sim.setActive(true);
+ //sim.setActive(true);
SimPersistTasks.update(sim, sessionFactory);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-12 13:08:32
|
Revision: 397
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=397&view=rev
Author: iansmith
Date: 2007-09-12 06:08:35 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Double idiot. Forgot to make active in both cases...
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 12:35:28 UTC (rev 396)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 13:08:35 UTC (rev 397)
@@ -43,6 +43,11 @@
sim.setSimURI(ourURI);
sim.setActive(true);
SimPersistTasks.update(sim, sessionFactory);
+ } else {
+ if (!sim.isActive()) {
+ sim.setActive(true);
+ SimPersistTasks.update(sim, sessionFactory);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-12 12:36:04
|
Revision: 396
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=396&view=rev
Author: iansmith
Date: 2007-09-12 05:35:28 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Idiot. Forgot to make the sim active when updating.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 12:06:08 UTC (rev 395)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 12:35:28 UTC (rev 396)
@@ -41,6 +41,7 @@
if (!(ourURI.equals(sim.getSimURI()))) {
//make it point to us
sim.setSimURI(ourURI);
+ sim.setActive(true);
SimPersistTasks.update(sim, sessionFactory);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-12 12:06:05
|
Revision: 395
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=395&view=rev
Author: iansmith
Date: 2007-09-12 05:06:08 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Added support for bringing up local sim on different machine from the one the DB was
created on.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 02:30:41 UTC (rev 394)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 12:06:08 UTC (rev 395)
@@ -31,7 +31,21 @@
public static void initializeLocalSim(URI serviceURI, SessionFactory sessionFactory) throws PersistException {
SimRecord[] simRecords = SimPersistTasks.findSims(sessionFactory);
+ URI ourURI=WebAPIUtil.appendToURI(serviceURI, "sim/");
+
if (simRecords.length != 0) {
+ //the db might have been created on another host (e.g. the amazon case)
+ for (int i=0; i<simRecords.length;++i) {
+ SimRecord sim=simRecords[i];
+ if (LOCAL_SIM_DISPLAY_NAME.equals(sim.getDisplayName())) {
+ if (!(ourURI.equals(sim.getSimURI()))) {
+ //make it point to us
+ sim.setSimURI(ourURI);
+ SimPersistTasks.update(sim, sessionFactory);
+ }
+ }
+ }
+ SimRecord rec = SimPersistTasks.findSimsBySimURI(ourURI, sessionFactory);
return;
}
SimPersistTasks.createSim(LOCAL_SIM_DISPLAY_NAME, WebAPIUtil.appendToURI(serviceURI, "sim/"), SimRecord.DEFAULT_EVENT_PORT, true, sessionFactory);
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java 2007-09-12 02:30:41 UTC (rev 394)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SimRecord.java 2007-09-12 12:06:08 UTC (rev 395)
@@ -78,6 +78,10 @@
}
return ArgumentUtils.createURI(simURIString);
}
+
+ public void setSimURI(URI uri) {
+ simURIString = uri.toString();
+ }
//hibernate access
private String getSimURIString() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-12 02:30:38
|
Revision: 394
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=394&view=rev
Author: iansmith
Date: 2007-09-11 19:30:41 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
Adding support for post-populate maven mojo.
Modified Paths:
--------------
maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java
maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java
Modified: maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java
===================================================================
--- maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java 2007-09-11 20:45:06 UTC (rev 393)
+++ maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/OgServiceMojoBase.java 2007-09-12 02:30:41 UTC (rev 394)
@@ -16,9 +16,9 @@
public abstract class OgServiceMojoBase extends AbstractMojo {
- protected static final String SPACE_PREFIX = "space-";
+ public static final String SPACE_PREFIX = "space-";
- protected static final String TEMPLATE_PREFIX = "template-";
+ public static final String TEMPLATE_PREFIX = "template-";
/**
* @parameter
@@ -30,7 +30,7 @@
*/
protected String serviceURI;
- /**
+ /**"space-"
* @parameter
*/
protected String username;
@@ -38,7 +38,7 @@
/**
* @parameter
*/
- private String password;
+ protected String password;
protected WebAPIClient validateArgsAndConnect() {
if (populateDir == null) {
Modified: maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java
===================================================================
--- maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java 2007-09-11 20:45:06 UTC (rev 393)
+++ maven/trunk/dev-plugins/src/main/java/com/ogoglio/plugin/PopulateMojo.java 2007-09-12 02:30:41 UTC (rev 394)
@@ -12,6 +12,7 @@
import nanoxml.XMLElement;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import com.ogoglio.client.WebAPIClient;
import com.ogoglio.util.StreamUtils;
@@ -53,9 +54,10 @@
patchSpaces(client);
}
- private void patchSpaces(WebAPIClient client) throws MojoExecutionException {
+ private SpaceDocument[] patchSpaces(WebAPIClient client) throws MojoExecutionException {
SpaceDocument fakeSpaceDoc, realSpaceDoc;
-
+ SpaceDocument[] result=new SpaceDocument[spaces.size()];
+
for (int i = 0; i < spaces.size(); ++i) {
fakeSpaceDoc = spaces.get(i);
try {
@@ -93,10 +95,12 @@
}
getLog().info("Patched up space " + realSpaceDoc.getDisplayName());
+ result[i]=realSpaceDoc;
} catch (IOException e) {
throw new MojoExecutionException("IOException patching space (" + fakeSpaceDoc.getDisplayName() + ":" + fakeSpaceDoc.getSpaceID() + ")", e);
}
}
+ return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-11 20:45:06
|
Revision: 393
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=393&view=rev
Author: trevorolio
Date: 2007-09-11 13:45:06 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
Add firebug console safety to ogoglio.js
Modified Paths:
--------------
maven/trunk/ogoglio-server/.classpath
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
Modified: maven/trunk/ogoglio-server/.classpath
===================================================================
--- maven/trunk/ogoglio-server/.classpath 2007-09-11 20:44:28 UTC (rev 392)
+++ maven/trunk/ogoglio-server/.classpath 2007-09-11 20:45:06 UTC (rev 393)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="src/main/resources/siteTemplates" path="src/main/resources/siteTemplates"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="src/main/resources/hibernate" path="src/main/resources/hibernate"/>
<classpathentry excluding="**" kind="src" output="src/main/resources/log4j" path="src/main/resources/log4j"/>
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js 2007-09-11 20:44:28 UTC (rev 392)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js 2007-09-11 20:45:06 UTC (rev 393)
@@ -6,6 +6,14 @@
return locLink.protocol + "//" + locLink.host + appPath;
}
+// Ignores Firebug (http://www.getfirebug.com/) console calls for browsers without firebug
+if(!window.console || !console.firebug){
+ var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
+ window.console = {};
+ for (var i = 0; i < names.length; ++i){
+ window.console[names[i]] = function() {}
+ }
+}
//BEGIN GENERAL UTILS
function parseLocationParameters(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-11 20:44:24
|
Revision: 392
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=392&view=rev
Author: trevorolio
Date: 2007-09-11 13:44:28 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
Remove annoying log printlns
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-09-11 17:51:47 UTC (rev 391)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-09-11 20:44:28 UTC (rev 392)
@@ -36,8 +36,6 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
try {
- Log.info("In AbstractRemoteServlet---init");
- System.out.println("In AbstractRemoveServlet---init no log");
Context envCtx = (Context) initCtx.lookup("java:comp/env");
ogoglioUsername = (String) envCtx.lookup(getOgoglioUsernameContextKey());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-11 17:52:06
|
Revision: 391
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=391&view=rev
Author: trevorolio
Date: 2007-09-11 10:51:47 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
Whacked the thingPopup to fit in an info panel.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/thingPopup.html
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/thingPopup.html
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/thingPopup.html 2007-09-10 22:36:05 UTC (rev 390)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/thingPopup.html 2007-09-11 17:51:47 UTC (rev 391)
@@ -192,15 +192,20 @@
</script>
<style type="text/css">
- .section input[type=submit] {
+ body {
+ width: 250px;
+ font-size: 10px;
+ line-height: 10px;
+ }
+ #main input[type=submit] {
width: 60px;
}
- .section input[type=text] {
+ #main input[type=text] {
width: 70px;
text-align: right;
}
- .section form {
+ #main form {
display: inline;
}
</style>
@@ -209,10 +214,8 @@
<body onload="init();">
<div id="content">
-<div id="main" style="">
- <h2 id="title">Thing:</h2>
- <div class="section">
- <h3>Translate:</h3>
+<div id="main">
+ <h3 id="title">Thing:</h3>
<input type='submit' onclick='move(0, 1, 0); return false;' value='Up'/>
<input type='submit' onclick='move(0, -1, 0); return false;' value='Down'/>
<form onsubmit='moveToY(this.yPosInput.value); return false;'><input type='text' size='3' id='yPosInput' /></form>
@@ -226,16 +229,14 @@
<form onsubmit='moveToX(this.xPosInput.value); return false;'><input type='text' size='3' id='xPosInput' /></form>
<br/>
<input type='submit' onclick='resetPosition(); return false;' value='Reset'/>
- </div> <!-- end section -->
- <div class="section">
- <h3>Vertical Rotate:</h3>
+ <hr />
<input type='submit' onclick='rotate(0, 0.5, 0); return false;' value='Y'/>
<input type='submit' onclick='rotate(0, -0.5, 0); return false;' value='-Y'/>
<form onsubmit='rotateToY(this.yRotInput.value); return false;'><input type='text' size='3' id='yRotInput' /></form>
<br/>
<input type='submit' onclick='resetVerticalRotation(); return false;' value='Reset'/>
- <h3>Horizontal Rotate:</h3>
+ <hr />
<input type='submit' onclick='rotate(0.5, 0, 0); return false;' value='X'/>
<input type='submit' onclick='rotate(-0.5, 0, 0); return false;' value='-X'/>
<form onsubmit='rotateToX(this.xRotInput.value); return false;'><input type='text' size='3' id='xRotInput' /></form>
@@ -245,11 +246,9 @@
<form onsubmit='rotateToZ(this.zRotInput.value); return false;'><input type='text' size='3' id='zRotInput' /></form>
<br/>
<input type='submit' onclick='resetHorizontalRotation(); return false;' value='Reset'/>
- </div> <!-- end section -->
- <div class="section">
- <h3>Scale: <form onsubmit='scaleTo(this.scaleInput.value); return false;'><input type='text' size='3' id='scaleInput' /></form></h3>
- </div>
+ <hr />
+ Scale: <form onsubmit='scaleTo(this.scaleInput.value); return false;'><input type='text' size='3' id='scaleInput' /></form>
</div>
</div><!-- end content -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-10 22:36:05
|
Revision: 390
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=390&view=rev
Author: iansmith
Date: 2007-09-10 15:36:05 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
Removed config cruft for when I was trying to do security.
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-09-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-09-10 22:36:05 UTC (rev 390)
@@ -18,20 +18,17 @@
import com.ogoglio.client.WebAPIClientWire;
import com.ogoglio.client.WebAPIDescriptor;
import com.ogoglio.util.ArgumentUtils;
+import com.ogoglio.util.Log;
import com.ogoglio.xml.AuthDocument;
public abstract class AbstractRemoteServlet extends MigratedResourceServlet {
- public static final String OGOGLIO_INTERNAL_URL_KEY = "ogoglio/internalURL";
-
private WebAPIClient ogoglioClient = null;
private String ogoglioUsername = null;
private String ogoglioPassword = null;
- private String internalURL = null;
-
public abstract String getOgoglioUsernameContextKey();
public abstract String getOgoglioPasswordContextKey();
@@ -39,6 +36,8 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
try {
+ Log.info("In AbstractRemoteServlet---init");
+ System.out.println("In AbstractRemoveServlet---init no log");
Context envCtx = (Context) initCtx.lookup("java:comp/env");
ogoglioUsername = (String) envCtx.lookup(getOgoglioUsernameContextKey());
@@ -46,8 +45,6 @@
ogoglioPassword = (String) envCtx.lookup(getOgoglioPasswordContextKey());
ArgumentUtils.assertNotEmpty(ogoglioPassword);
- internalURL = (String) envCtx.lookup(OGOGLIO_INTERNAL_URL_KEY);
-
} catch (NamingException e) {
throw new ServletException("Could not init EventServlet (probably forgot env variables in setup.xml): " + e);
}
@@ -57,7 +54,7 @@
if (ogoglioClient == null) {
try {
WebAPIClientWire wire = new WebAPIClientWire();
- URI serviceURI = new URI(internalURL);
+ URI serviceURI = new URI(baseUrl);
WebAPIDescriptor descriptor = new WebAPIDescriptor(serviceURI);
WebAPIAuthenticator authenticator = new WebAPIAuthenticatorFactory().authenticate(wire, descriptor, ogoglioUsername, ogoglioPassword);
ogoglioClient = new WebAPIClient(new WebAPIDescriptor(serviceURI), authenticator, wire);
Modified: maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2007-09-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2007-09-10 22:36:05 UTC (rev 390)
@@ -1,6 +1,5 @@
# basic info needed for some tests
ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
ogoglio.baseUrl = ${ogoglio.baseURL}
-ogoglio.internalUrl = ${ogoglio.internalURL}
ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-10 22:36:05 UTC (rev 390)
@@ -198,7 +198,7 @@
<!-- these are for the populate -->
<configuration>
- <serviceURI>${ogoglio.internalURL}</serviceURI>
+ <serviceURI>${ogoglio.baseURL}</serviceURI>
<username>${ogoglio.bootstrapUser}</username>
<password>${ogoglio.bootstrapUserPW}</password>
<populateDir>src/main/resources/populate</populateDir>
Modified: maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-09-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-09-10 22:36:05 UTC (rev 390)
@@ -18,7 +18,6 @@
<Environment name="ogoglio/okToMigrateDB" value="${ogoglio.okToMigrateDB}" type="java.lang.String"/>
<Environment name="ogoglio/mediaURL" value="${ogoglio.mediaURL}" type="java.lang.String"/>
<Environment name="ogoglio/baseURL" value="${ogoglio.baseURL}" type="java.lang.String"/>
- <Environment name="ogoglio/internalURL" value="${ogoglio.internalURL}" type="java.lang.String"/>
<Environment name="ogoglio/simsAllowRemoteAccess" value="true" type="java.lang.String" />
<Environment name="ogoglio/mediaDirectory" value="${ogoglio.mediaDirectory}" type="java.lang.String"/>
<Environment name="ogoglio/bootstrapUser" value="${ogoglio.bootstrapUser}" type="java.lang.String"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-08 20:35:19
|
Revision: 389
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=389&view=rev
Author: iansmith
Date: 2007-09-08 13:35:20 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
Removed all the references to 127.0.0.1 and replaced with values computed from the
settings.xml file. In principle, this will allow testing of machines in the cluster
from a remote host. For now, this is just cleanliness.
Modified Paths:
--------------
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java
maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java
maven/trunk/ogoglio-server/src/test/resources/basic-config.properties
maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java
Removed Paths:
-------------
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -174,6 +174,8 @@
}
MultiuserTests tests = null;
try {
+ //If you are going to run a test like this, these should be pulled from
+ //the properties files....
//String serviceURI = "http://127.0.0.1:8080/og/";
//String spaceURI = "http://127.0.0.1:8080/og/space/1/";
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/AppletTestWindow.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -134,10 +134,12 @@
if (fullScreen) {
dim = new Dimension(device.getDisplayMode().getWidth(), device.getDisplayMode().getWidth());
}
- String serviceURI = "http://127.0.0.1:8080/og/";
- String loginCookie = null;
+ String serviceURI=null;
+ String loginCookie=null;
try {
- PropStorage ps = new PropStorage();
+ PropStorage ps=new PropStorage();
+ ps.loadPropertySet(PropStorage.BASIC_PROPS);
+ serviceURI = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseUrl");
ps.loadPropertySet(PropStorage.BOOTSTRAP_PROPS);
WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), new WebAPIDescriptor(new URI(serviceURI)), ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUser"), ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUserPW"));
loginCookie = authenticator.getAuthCookie();
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -87,7 +87,11 @@
public void setUp() {
try {
- serviceURI1 = new URI("http://127.0.0.1:8080/og/"); //best choice: 127.0.0.1 for tests
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ fail("couldn't load property set (BASIC)");
+ }
+ serviceURI1 = new URI(ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseUrl"));
linkURI1 = new URI("http://example.com/");
wire1 = new WebAPIClientWire();
descriptor1 = new WebAPIDescriptor(serviceURI1);
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/SpaceDuplicatorTest.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -13,6 +13,7 @@
import com.ogoglio.client.WebAPIClient;
import com.ogoglio.client.WebAPIClientWire;
import com.ogoglio.client.WebAPIDescriptor;
+import com.ogoglio.util.PropStorage;
import com.ogoglio.xml.DoorDocument;
import com.ogoglio.xml.PositionedDocument;
import com.ogoglio.xml.SpaceDocument;
@@ -42,7 +43,11 @@
try {
spaceID1 = 1;
spaceID2 = 2;
- serviceURI1 = new URI("http://127.0.0.1:8080/og/");
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ fail("couldn't load property set (BASIC)");
+ }
+ serviceURI1 = new URI(ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseUrl"));
descriptor = new WebAPIDescriptor(serviceURI1);
wire = new WebAPIClientWire();
auth = new WebAPIAuthenticator(wire, descriptor, ClientTest.USERNAME1, ClientTest.PASSWORD1);
Modified: maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties 2007-09-08 20:35:20 UTC (rev 389)
@@ -1,4 +1,6 @@
# basic info needed for some tests
ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
ogoglio.baseUrl = ${ogoglio.baseURL}
+ogoglio.internalUrl = ${ogoglio.internalURL}
+ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
Deleted: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web-demo.xml 2007-09-08 20:35:20 UTC (rev 389)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <servlet>
- <servlet-name>AccountServlet</servlet-name>
- <servlet-class>com.ogoglio.site.AccountServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>AuthServlet</servlet-name>
- <servlet-class>com.ogoglio.site.AuthServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>SpaceServlet</servlet-name>
- <servlet-class>com.ogoglio.site.SpaceServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>MediaServlet</servlet-name>
- <servlet-class>com.ogoglio.media.site.MediaServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>SimServlet</servlet-name>
- <servlet-class>com.ogoglio.sim.site.SimServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>AccountServlet</servlet-name>
- <url-pattern>/account/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AuthServlet</servlet-name>
- <url-pattern>/auth/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SpaceServlet</servlet-name>test
- <url-pattern>/space/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SimServlet</servlet-name>
- <url-pattern>/sim/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>MediaServlet</servlet-name>
- <url-pattern>/media/*</url-pattern>
- </servlet-mapping>
-
- <error-page>
- <error-code>404</error-code>
- <location>/notFound.html</location>
- </error-page>
-
-<!-- Start Authentication -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>SecurityRestriction</web-resource-name>
- <description>Demo For Friends Only</description>
- <url-pattern>/</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>Demo Users Group</description>
- <role-name>demo</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
-
- <security-role>
- <description>Demo role</description>
- <role-name>demo</role-name>
- </security-role>
-
- <!-- End Authentication -->
-</web-app>
Modified: maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java
===================================================================
--- maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-server/src/test/java/com/ogoglio/persist/test/PersistTest.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -20,8 +20,6 @@
import com.ogoglio.appdev.migrate.MigrationSupport;
import com.ogoglio.appdev.migrate.test.DBZapTest;
import com.ogoglio.appdev.persist.PersistException;
-import com.ogoglio.client.WebAPIClient;
-import com.ogoglio.client.WebAPIDescriptor;
import com.ogoglio.media.MediaService;
import com.ogoglio.migrate.OgoglioServerMigration;
import com.ogoglio.persist.AccountPersistTasks;
@@ -83,7 +81,11 @@
level2 = "pro";
try {
- simURI1 = new URI("http://127.0.0.1:8080/sim");
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ fail("Can't load prop set (BASIC)");
+ }
+ simURI1 = new URI(ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseSimUrl"));
} catch (URISyntaxException e) {
fail("bad URI:"+e.getMessage());
}
Modified: maven/trunk/ogoglio-server/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-server/src/test/resources/basic-config.properties 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-server/src/test/resources/basic-config.properties 2007-09-08 20:35:20 UTC (rev 389)
@@ -1,4 +1,5 @@
# basic info needed for some tests
ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
ogoglio.baseUrl = ${ogoglio.baseURL}
-ogoglio.mediaDirectory = ${ogoglio.mediaDirectory}
\ No newline at end of file
+ogoglio.mediaDirectory = ${ogoglio.mediaDirectory}
+ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
Modified: maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java 2007-09-08 19:04:09 UTC (rev 388)
+++ maven/trunk/ogoglio-viewer-applet/src/test/java/com/ogoglio/viewer/test/AppletTestWindow.java 2007-09-08 20:35:20 UTC (rev 389)
@@ -45,12 +45,6 @@
EnvironmentStub clientStub1 = null;
- String host = "127.0.0.1:8080";
-
- String serviceURI = "http://" + host + "/og/";
-
- URL codeBase = getURL(serviceURI);
-
static boolean fullScreen = false;
public AppletTestWindow() {
@@ -70,9 +64,11 @@
Log.error("Can't find basic properties!");
System.exit(1);
}
+ String serviceURI=ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
HashMap parameters1 = new HashMap();
try {
- WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(), new WebAPIDescriptor(new URI(serviceURI)),
+ WebAPIAuthenticator authenticator = new WebAPIAuthenticator(new WebAPIClientWire(),
+ new WebAPIDescriptor(new URI(serviceURI)),
ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUser"),
ps.getKeyFromSet(PropStorage.BOOTSTRAP_PROPS, "bootstrapUserPW"));
parameters1.put(WebConstants.AUTH_COOKIE, authenticator.getAuthCookie());
@@ -116,11 +112,17 @@
}
public URL getCodeBase() {
- return codeBase;
+ PropStorage ps=new PropStorage();
+ if (!ps.loadPropertySet(PropStorage.BASIC_PROPS)) {
+ Log.error("Can't find basic properties!");
+ System.exit(1);
+ }
+ String serviceURI=ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.baseURL");
+ return getURL(serviceURI);
}
public URL getDocumentBase() {
- return codeBase;
+ return getCodeBase();
}
public String getParameter(String name) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2007-09-08 19:04:06
|
Revision: 388
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=388&view=rev
Author: iansmith
Date: 2007-09-08 12:04:09 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
More combat to allow protected instances of the server to be run.
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-09-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-09-08 19:04:09 UTC (rev 388)
@@ -22,11 +22,15 @@
public abstract class AbstractRemoteServlet extends MigratedResourceServlet {
+ public static final String OGOGLIO_INTERNAL_URL_KEY = "ogoglio/internalURL";
+
private WebAPIClient ogoglioClient = null;
private String ogoglioUsername = null;
private String ogoglioPassword = null;
+
+ private String internalURL = null;
public abstract String getOgoglioUsernameContextKey();
@@ -41,6 +45,9 @@
ArgumentUtils.assertNotEmpty(ogoglioUsername);
ogoglioPassword = (String) envCtx.lookup(getOgoglioPasswordContextKey());
ArgumentUtils.assertNotEmpty(ogoglioPassword);
+
+ internalURL = (String) envCtx.lookup(OGOGLIO_INTERNAL_URL_KEY);
+
} catch (NamingException e) {
throw new ServletException("Could not init EventServlet (probably forgot env variables in setup.xml): " + e);
}
@@ -50,7 +57,7 @@
if (ogoglioClient == null) {
try {
WebAPIClientWire wire = new WebAPIClientWire();
- URI serviceURI = new URI(getBaseUrl());
+ URI serviceURI = new URI(internalURL);
WebAPIDescriptor descriptor = new WebAPIDescriptor(serviceURI);
WebAPIAuthenticator authenticator = new WebAPIAuthenticatorFactory().authenticate(wire, descriptor, ogoglioUsername, ogoglioPassword);
ogoglioClient = new WebAPIClient(new WebAPIDescriptor(serviceURI), authenticator, wire);
Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java 2007-09-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java 2007-09-08 19:04:09 UTC (rev 388)
@@ -57,7 +57,7 @@
private boolean noCache = true;
- // WARNING: This is really, really easy to hose yourself with. This will get called
+ // WARNING: This is really, really easy to hose yourself with this. This will get called
// WARNING: during the init() of this class, so it is very easy to end up calling this
// WARNING: init method "too soon" in your init method, before you are fully initialized
public abstract SiteResource createBaseResource(ServletConfig servletConfig);
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-08 19:04:09 UTC (rev 388)
@@ -198,7 +198,7 @@
<!-- these are for the populate -->
<configuration>
- <serviceURI>${ogoglio.baseURL}</serviceURI>
+ <serviceURI>${ogoglio.internalURL}</serviceURI>
<username>${ogoglio.bootstrapUser}</username>
<password>${ogoglio.bootstrapUserPW}</password>
<populateDir>src/main/resources/populate</populateDir>
Modified: maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-09-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-09-08 19:04:09 UTC (rev 388)
@@ -2,9 +2,6 @@
<Context reloadable="true" path="/og" >
<Realm className="org.apache.catalina.realm.MemoryRealm" />
- <tomcat-users>
-
- </tomcat-users>
<Resource name="jdbc/space" scope="Shareable"
type="javax.sql.DataSource" auth='Container'
factory="org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory"
@@ -16,16 +13,12 @@
show_sql="false"
maxIdle="5"
maxActive="50" />
-
- <tomcat-users>
- <role rolename="admin"/>
- <user username="seattle" password="demolove" roles="demo"/>
- </tomcat-users>
<Environment name="ogoglio/oktoZapDB" value="false" type="java.lang.String"/> <!-- not running tests! -->
<Environment name="ogoglio/okToMigrateDB" value="${ogoglio.okToMigrateDB}" type="java.lang.String"/>
<Environment name="ogoglio/mediaURL" value="${ogoglio.mediaURL}" type="java.lang.String"/>
<Environment name="ogoglio/baseURL" value="${ogoglio.baseURL}" type="java.lang.String"/>
+ <Environment name="ogoglio/internalURL" value="${ogoglio.internalURL}" type="java.lang.String"/>
<Environment name="ogoglio/simsAllowRemoteAccess" value="true" type="java.lang.String" />
<Environment name="ogoglio/mediaDirectory" value="${ogoglio.mediaDirectory}" type="java.lang.String"/>
<Environment name="ogoglio/bootstrapUser" value="${ogoglio.bootstrapUser}" type="java.lang.String"/>
Modified: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml 2007-09-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml 2007-09-08 19:04:09 UTC (rev 388)
@@ -41,7 +41,7 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>SpaceServlet</servlet-name>test
+ <servlet-name>SpaceServlet</servlet-name>
<url-pattern>/space/*</url-pattern>
</servlet-mapping>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tre...@us...> - 2007-09-08 00:30:33
|
Revision: 387
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=387&view=rev
Author: trevorolio
Date: 2007-09-07 17:30:36 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Tweak applet loading process.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java 2007-09-07 21:40:40 UTC (rev 386)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java 2007-09-08 00:30:36 UTC (rev 387)
@@ -119,7 +119,6 @@
return;
}
String name = pathElements[pathElements.length - 1];
- Log.debug("in doPut of media servlet:"+name);
fileStore.write(name, request.getInputStream(), -1);
response.setStatus(HttpServletResponse.SC_OK);
response.setContentLength(0);
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js 2007-09-07 21:40:40 UTC (rev 386)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js 2007-09-08 00:30:36 UTC (rev 387)
@@ -1,5 +1,6 @@
var viewerWidth = 700;
var viewerHeight = 500;
+var appletLoadingImagePath = appPath + "/icons/32x32/face-monkey.png";
var startX = 0;
var startY = 0;
var startZ = 0;
@@ -78,7 +79,7 @@
html += "<param name='loginCookie' value='" + loginCookie + "' />";
html += "<param name='serviceURI' value='" + serviceURI + "' />";
html += "<param name='spaceID' value='" + locationParameters['spaceID'] + "' />";
- html += "<param name='image' value='" + appPath + "/icons/32x32/face-monkey.png' />";
+ html += "<param name='image' value='" + appletLoadingImagePath + "' />";
if(startX != 0){
html += "<param name='x' value='" + startX + "' />";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
