Revision: 4896
Author:
abhishek...@wishtreetech.com
Date: Tue Sep 2 06:32:09 2014 UTC
Log: Fixes for Avatar collision, Avatar shadow and Graphics issues
https://code.google.com/p/openwonderland/source/detail?r=4896
Modified:
/trunk/core/ext/jme20/target/jme.jar
/trunk/modules/world/avatarbase/build.xml
/trunk/modules/world/avatarbase/lib/avatars.jar
/trunk/modules/world/avatarbase/src/classes/org/jdesktop/wonderland/modules/avatarbase/client/jme/cellrenderer/AvatarImiJME.java
=======================================
--- /trunk/core/ext/jme20/target/jme.jar Fri Oct 11 08:39:55 2013 UTC
+++ /trunk/core/ext/jme20/target/jme.jar Tue Sep 2 06:32:09 2014 UTC
File is too large to display a diff.
=======================================
--- /trunk/modules/world/avatarbase/build.xml Fri Oct 15 19:58:48 2010 UTC
+++ /trunk/modules/world/avatarbase/build.xml Tue Sep 2 06:32:09 2014 UTC
@@ -47,7 +47,7 @@
<target name="dist" depends="build">
<mkdir dir="${module.dist.dir}"/>
- <module name="avatarbase" majorVersion="0" minorVersion="5"
miniVersion="2" jarfile="${module.dist.dir}/avatarbase.jar"
+ <module name="avatarbase" majorVersion="0" minorVersion="5"
miniVersion="3" jarfile="${module.dist.dir}/avatarbase.jar"
moduleDescription="Avatar API and library"
builddir="${build.dir}">
<requires name="content-repository" version="0"
minorVersion="5"/>
=======================================
--- /trunk/modules/world/avatarbase/lib/avatars.jar Thu Jul 18 13:45:19
2013 UTC
+++ /trunk/modules/world/avatarbase/lib/avatars.jar Tue Sep 2 06:32:09
2014 UTC
File is too large to display a diff.
=======================================
---
/trunk/modules/world/avatarbase/src/classes/org/jdesktop/wonderland/modules/avatarbase/client/jme/cellrenderer/AvatarImiJME.java
Thu Jul 18 13:45:19 2013 UTC
+++
/trunk/modules/world/avatarbase/src/classes/org/jdesktop/wonderland/modules/avatarbase/client/jme/cellrenderer/AvatarImiJME.java
Tue Sep 2 06:32:09 2014 UTC
@@ -1,3 +1,7 @@
+/**
+ * Copyright (c) 2014, WonderBuilders, Inc., All Rights Reserved
+ */
+
/**
* Open Wonderland
*
@@ -37,6 +41,7 @@
import org.jdesktop.wonderland.client.jme.input.AvatarCollisionEvent;
import com.jme.bounding.BoundingSphere;
+import com.jme.bounding.BoundingBox;
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.logging.Level;
@@ -51,6 +56,7 @@
import com.jme.scene.Geometry;
import com.jme.scene.Spatial.CullHint;
import com.jme.scene.shape.Box;
+import com.jme.scene.shape.Sphere;
import com.jme.scene.state.RenderState;
import com.jme.scene.state.ZBufferState;
import imi.character.CharacterAnimationProcessor;
@@ -789,15 +795,13 @@
private void setCollisionController(WlAvatarCharacter avatar) {
// Create a spatial that represents the bounds of the avatar to use
// for collision. These are hardcoded values for now.
- Vector3f origin = new Vector3f(0f, 0.92f, 0.15f);
- float xExtent = 0.3f;
- float yExtent = 0.6f;
- float zExtent = 0.15f;
+ Vector3f origin = new Vector3f(0f, 0.57f, 0.0f);
+ float radius = 0.25f;
- if (selectedForInput) {
- Spatial collisionGraph = new Box("AvatarCollision", origin,
xExtent,
- yExtent, zExtent);
- collisionGraph.setModelBound(new BoundingSphere());
+ if (selectedForInput) {
+ Spatial collisionGraph = new Sphere("AvatarCollision", origin,
10, 10, radius);
+
+ collisionGraph.setModelBound(new BoundingBox());
collisionGraph.updateModelBound();
// Fetch the JME Collision system using the server manager of
the Cell