[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [x3d-public] compilation problem - patch
On Friday 17 March 2006 22:55, you wrote:
> After removing some uncompilable files and few minor changes I've managed
> to build the project.
I finally succeed building Xj3D. I've attached a patch file with
all changes I made.
> Thanks,
>
> Marko
Jens
Index: make/Makefile.config
===================================================================
RCS file: /cvs/xj3d/cvsroot/Xj3D/make/Makefile.config,v
retrieving revision 1.2
diff -u -r1.2 Makefile.config
--- make/Makefile.config 13 Sep 2005 16:30:03 -0000 1.2
+++ make/Makefile.config 17 Mar 2006 16:59:37 -0000
@@ -57,7 +57,7 @@
SOURCEPATH = $(CONFIG_SRC_DIR)
-CP = $(CLASS_DIR)
+CP := "$(CLASS_DIR)$(PATH_SEP)$(CLASSPATH)"
ifdef LOCAL_JARLIST
ifdef CP
Index: make/jar/Makefile.xj3d-ogl
===================================================================
RCS file: /cvs/xj3d/cvsroot/Xj3D/make/jar/Makefile.xj3d-ogl,v
retrieving revision 1.17
diff -u -r1.17 Makefile.xj3d-ogl
--- make/jar/Makefile.xj3d-ogl 3 Jan 2005 20:37:36 -0000 1.17
+++ make/jar/Makefile.xj3d-ogl 17 Mar 2006 16:59:37 -0000
@@ -30,10 +30,8 @@
org/web3d/vrml/renderer/ogl/nodes/group \
org/web3d/vrml/renderer/ogl/nodes/hanim \
org/web3d/vrml/renderer/ogl/nodes/interpolator \
- org/web3d/vrml/renderer/ogl/nodes/lighting \
org/web3d/vrml/renderer/ogl/nodes/navigation \
org/web3d/vrml/renderer/ogl/nodes/networking \
- org/web3d/vrml/renderer/ogl/nodes/particle \
org/web3d/vrml/renderer/ogl/nodes/picking \
org/web3d/vrml/renderer/ogl/nodes/render \
org/web3d/vrml/renderer/ogl/nodes/rigidphysics \
@@ -47,6 +45,8 @@
org/web3d/ogl/browser \
org/web3d/ogl/loaders \
org/web3d/ogl/device/mouse
+# org/web3d/vrml/renderer/ogl/nodes/lighting \
+# org/web3d/vrml/renderer/ogl/nodes/particle \
# Manifest file name. Stored in the make/manifest directory
MANIFEST=xj3d-ogl.mf
Index: parsetest/xj3d_extensions/physics/body_basic.x3dv
===================================================================
RCS file: /cvs/xj3d/cvsroot/Xj3D/parsetest/xj3d_extensions/physics/body_basic.x3dv,v
retrieving revision 1.1
diff -u -r1.1 body_basic.x3dv
--- parsetest/xj3d_extensions/physics/body_basic.x3dv 16 Oct 2004 20:43:07 -0000 1.1
+++ parsetest/xj3d_extensions/physics/body_basic.x3dv 17 Mar 2006 16:59:37 -0000
@@ -1,7 +1,7 @@
#X3D V3.0 utf8
PROFILE Immersive
-COMPONENT xj3d_RigidBodyPhysics:1
+COMPONENT xj3d_RigidBodyPhysics:2
RigidBodyCollection {
bodies [
Index: src/java/org/web3d/vrml/renderer/common/nodes/geom3d/BaseIndexedFaceSet.java
===================================================================
RCS file: /cvs/xj3d/cvsroot/Xj3D/src/java/org/web3d/vrml/renderer/common/nodes/geom3d/BaseIndexedFaceSet.java,v
retrieving revision 1.25
diff -u -r1.25 BaseIndexedFaceSet.java
--- src/java/org/web3d/vrml/renderer/common/nodes/geom3d/BaseIndexedFaceSet.java 4 Mar 2006 01:30:43 -0000 1.25
+++ src/java/org/web3d/vrml/renderer/common/nodes/geom3d/BaseIndexedFaceSet.java 17 Mar 2006 16:59:37 -0000
@@ -26,6 +26,7 @@
import org.web3d.vrml.nodes.*;
import org.web3d.vrml.renderer.common.nodes.BaseIndexedGeometryNode;
+import org.web3d.vrml.renderer.common.nodes.GeometryUtils;
/**
* An abstract implementation of an IndexedFaceSet
Index: src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleFanSet.java
===================================================================
RCS file: /cvs/xj3d/cvsroot/Xj3D/src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleFanSet.java,v
retrieving revision 1.2
diff -u -r1.2 J3DIndexedTriangleFanSet.java
--- src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleFanSet.java 3 Oct 2005 06:31:58 -0000 1.2
+++ src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleFanSet.java 17 Mar 2006 16:59:37 -0000
@@ -246,7 +246,7 @@
/**
* Build the geometry structure used by Java3D from this input.
*/
- private void buildImpl() {
+ protected void buildImpl() {
// We really should do something here so that if the coords are
// removed, it will clear the object geometry.
if((numIndex == 0) || (vfCoord == null) ||
Index: src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleSet.java
===================================================================
RCS file: /cvs/xj3d/cvsroot/Xj3D/src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleSet.java,v
retrieving revision 1.4
diff -u -r1.4 J3DIndexedTriangleSet.java
--- src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleSet.java 3 Oct 2005 06:31:58 -0000 1.4
+++ src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleSet.java 17 Mar 2006 16:59:37 -0000
@@ -246,7 +246,7 @@
/**
* Build the geometry structure used by Java3D from this input.
*/
- private void buildImpl() {
+ protected void buildImpl() {
// We really should do something here so that if the coords are
// removed, it will clear the object geometry.
if((numIndex == 0) || (vfCoord == null) ||
Index: src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleStripSet.java
===================================================================
RCS file: /cvs/xj3d/cvsroot/Xj3D/src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleStripSet.java,v
retrieving revision 1.2
diff -u -r1.2 J3DIndexedTriangleStripSet.java
--- src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleStripSet.java 3 Oct 2005 06:31:58 -0000 1.2
+++ src/java/org/web3d/vrml/renderer/j3d/nodes/render/J3DIndexedTriangleStripSet.java 17 Mar 2006 16:59:37 -0000
@@ -246,7 +246,7 @@
/**
* Build the geometry structure used by Java3D from this input.
*/
- private void buildImpl() {
+ protected void buildImpl() {
// We really should do something here so that if the coords are
// removed, it will clear the object geometry.
if((numIndex == 0) || (vfCoord == null) ||