diff --git a/core-cpp/src/main/java/org/ode4j/cpp/internal/ApiCppOdeInit.java b/core-cpp/src/main/java/org/ode4j/cpp/internal/ApiCppOdeInit.java index 990a2cbe..f0080567 100644 --- a/core-cpp/src/main/java/org/ode4j/cpp/internal/ApiCppOdeInit.java +++ b/core-cpp/src/main/java/org/ode4j/cpp/internal/ApiCppOdeInit.java @@ -22,6 +22,7 @@ package org.ode4j.cpp.internal; import org.ode4j.ode.OdeHelper; +import org.ode4j.ode.internal.OdeInit; /** @@ -103,7 +104,7 @@ public static void dInitODE() { * @return A nonzero if initialization succeeded and zero otherwise. * * @see #dCloseODE() - * @see OdeInit + * @see OdeInit#dInitODE2(int) */ //* @see #dInitODEFlags //ODE_API diff --git a/core/src/main/java/org/ode4j/math/DVector3.java b/core/src/main/java/org/ode4j/math/DVector3.java index f793ee49..57d789a1 100644 --- a/core/src/main/java/org/ode4j/math/DVector3.java +++ b/core/src/main/java/org/ode4j/math/DVector3.java @@ -302,7 +302,6 @@ public final double dot(DVector3View b) { /** * Return the 'dot' product of two vectors. * r = a0*b0 + a1*b1 + a2*b2; - * @param b * @return (this) * b */ public final double dot(double[] da, int pos) { diff --git a/core/src/main/java/org/ode4j/ode/DWorld.java b/core/src/main/java/org/ode4j/ode/DWorld.java index 62bbad48..98f662c8 100644 --- a/core/src/main/java/org/ode4j/ode/DWorld.java +++ b/core/src/main/java/org/ode4j/ode/DWorld.java @@ -255,7 +255,7 @@ public interface DWorld { * * @see #cleanupWorkingMemory() * @see #setStepMemoryReservationPolicy(DWorldStepReserveInfo) - * @see #setStepMemoryManager(DWorldStepMemoryFunctionsInfo) +// * @see #setStepMemoryManager(DWorldStepMemoryFunctionsInfo) */ boolean useSharedWorkingMemory(DWorld from_world/*=NULL*/); @@ -275,7 +275,7 @@ public interface DWorld { * * @see #useSharedWorkingMemory(DWorld) * @see #setStepMemoryReservationPolicy(DWorldStepReserveInfo) - * @see #setStepMemoryManager(DWorldStepMemoryFunctionsInfo) +// * @see #setStepMemoryManager(DWorldStepMemoryFunctionsInfo) */ void cleanupWorkingMemory(); diff --git a/core/src/main/java/org/ode4j/ode/internal/DxGimpactCollision.java b/core/src/main/java/org/ode4j/ode/internal/DxGimpactCollision.java index dc52f920..90da4f0d 100644 --- a/core/src/main/java/org/ode4j/ode/internal/DxGimpactCollision.java +++ b/core/src/main/java/org/ode4j/ode/internal/DxGimpactCollision.java @@ -93,9 +93,9 @@ private static vec4f DVector4Tovec4f(DVector4C v) { // should be patched through to the dDOUBLE version above //#define gim_trimesh_get_triangle_vertices gim_trimesh_get_triangle_verticesODE - static void gim_trimesh_get_triangle_verticesODE( GimTrimesh mesh ) { - mesh.gim_trimesh_get_triangle_vertices(0, null, null, null); - } +// static void gim_trimesh_get_triangle_verticesODE( GimTrimesh mesh ) { +// mesh.gim_trimesh_get_triangle_vertices(0, null, null, null); +// } // inline int gim_trimesh_ray_closest_collisionODE( GIM_TRIMESH *mesh, dVector3 origin, // dVector3 dir, GREAL tmax, GIM_TRIANGLE_RAY_CONTACT_DATA *contact ) { diff --git a/core/src/main/java/org/ode4j/ode/internal/DxWorld.java b/core/src/main/java/org/ode4j/ode/internal/DxWorld.java index 7907b671..bdf802c9 100644 --- a/core/src/main/java/org/ode4j/ode/internal/DxWorld.java +++ b/core/src/main/java/org/ode4j/ode/internal/DxWorld.java @@ -1358,7 +1358,7 @@ public void setStepThreadingImplementation( * * free_block is a function to delete existing memory block. * - * @see DWorld#setStepMemoryManager(DWorldStepMemoryFunctionsInfo) +// * @see DWorld#setStepMemoryManager(DWorldStepMemoryFunctionsInfo) * @deprecated Do not use ! (TZ) */ public static class DWorldStepMemoryFunctionsInfo diff --git a/core/src/main/java/org/ode4j/ode/threading/DThreadingImplementation.java b/core/src/main/java/org/ode4j/ode/threading/DThreadingImplementation.java index b75a92c9..4126a72a 100644 --- a/core/src/main/java/org/ode4j/ode/threading/DThreadingImplementation.java +++ b/core/src/main/java/org/ode4j/ode/threading/DThreadingImplementation.java @@ -60,10 +60,9 @@ public abstract class DThreadingImplementation { * Do not use this function with self-made custom implementations - * they should be bundled with their own set of functions. * - * @param impl Threading implementation ID * @return Pointer to associated functions structure * - * @see dThreadingAllocateMultiThreadedImplementation + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation */ public abstract DThreadingFunctionsInfo dThreadingImplementationGetFunctions(); @@ -87,8 +86,8 @@ public abstract class DThreadingImplementation { * If this function is called for self-threaded built-in threading implementation * the call has no effect. * - * @see dThreadingAllocateMultiThreadedImplementation - * @see dThreadingImplementationCleanupForRestart + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation + * @see #dThreadingImplementationCleanupForRestart */ public void shutdownProcessing() { dThreadingImplementationShutdownProcessing(); @@ -106,10 +105,8 @@ public void shutdownProcessing() { * If this function is called for self-threaded built-in threading implementation * the call has no effect. * - * @param impl Threading implementation ID - * - * @see dThreadingAllocateMultiThreadedImplementation - * @see dThreadingImplementationShutdownProcessing + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation + * @see #shutdownProcessing() */ public abstract void dThreadingImplementationCleanupForRestart(); @@ -120,7 +117,7 @@ public void shutdownProcessing() { * from all the objects it was assigned to and that there are no more threads * serving it before attempting to call this function. * - * @see dThreadingAllocateMultiThreadedImplementation + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation */ public abstract void free(); //public abstract void dThreadingFreeImplementation(); @@ -146,12 +143,11 @@ public interface DThreadReadyToServeCallback { * be used until all dedicated threads register within it as otherwise it will not * have accurate view of the execution resources available. * - * @param impl Threading implementation ID * @param readiness_callback Optional readiness callback to be called after thread enters the implementation * @param callback_context A value to be passed as parameter to readiness callback * - * @see dThreadingAllocateMultiThreadedImplementation - * @see dThreadingImplementationShutdownProcessing + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation + * @see #shutdownProcessing() */ public abstract void dExternalThreadingServeMultiThreadedImplementation( DThreadReadyToServeCallback readiness_callback/*=NULL*/, CallContext callback_context/*=NULL*/); diff --git a/core/src/main/java/org/ode4j/ode/threading/DThreadingThreadPool.java b/core/src/main/java/org/ode4j/ode/threading/DThreadingThreadPool.java index 2d4afbcc..812994ad 100644 --- a/core/src/main/java/org/ode4j/ode/threading/DThreadingThreadPool.java +++ b/core/src/main/java/org/ode4j/ode/threading/DThreadingThreadPool.java @@ -52,9 +52,9 @@ public abstract class DThreadingThreadPool { * @param ode_data_allocate_flags Flags to be passed to @c dAllocateODEDataForThread on behalf of each thread * @return ID of object allocated or NULL on failure * - * @see dThreadingAllocateMultiThreadedImplementation - * @see dThreadingImplementationShutdownProcessing - * @see dThreadingFreeThreadPool + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation + * @see DThreadingImplementation#shutdownProcessing() + * @see #freeThreadPool() */ public static DThreadingThreadPool allocateThreadPool(int thread_count, int stack_size, int ode_data_allocate_flags, Object[][] reserved/*=NULL*/) { @@ -73,12 +73,11 @@ public static DThreadingThreadPool allocateThreadPool(int thread_count, * This function waits for threads to register within implementation before returning. * So, after the function call exits the implementation can be used immediately. * - * @param pool Thread pool ID to serve the implementation * @param impl Implementation ID of implementation to be served * - * @see dThreadingAllocateThreadPool - * @see dThreadingAllocateMultiThreadedImplementation - * @see dThreadingImplementationShutdownProcessing + * @see #allocateThreadPool(int, int, int, Object[][]) + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation + * @see DThreadingImplementation#shutdownProcessing() */ public abstract void serveMultiThreadedImplementation(DThreadingImplementation impl); @@ -97,11 +96,9 @@ public static DThreadingThreadPool allocateThreadPool(int thread_count, * It is OK to call this function even if pool was not serving any threading implementation * in which case the call exits immediately with minimal delay. * - * @param pool Thread pool ID to wait for - * - * @see dThreadingAllocateThreadPool - * @see dThreadingImplementationShutdownProcessing - * @see dThreadingFreeThreadPool + * @see #allocateThreadPool(int, int, int, Object[][]) + * @see DThreadingImplementation#shutdownProcessing() + * @see #freeThreadPool() */ public abstract void waitIdleState(); @@ -112,10 +109,8 @@ public static DThreadingThreadPool allocateThreadPool(int thread_count, * before this function is called. Otherwise the call is going to block * and wait until pool's threads return. * - * @param pool Thread pool ID to delete - * - * @see dThreadingAllocateThreadPool - * @see dThreadingImplementationShutdownProcessing + * @see #allocateThreadPool(int, int, int, Object[][]) + * @see DThreadingImplementation#shutdownProcessing() */ public abstract void freeThreadPool(); diff --git a/core/src/main/java/org/ode4j/ode/threading/DxThreadingImplementation.java b/core/src/main/java/org/ode4j/ode/threading/DxThreadingImplementation.java index 41d4469e..530ae46e 100644 --- a/core/src/main/java/org/ode4j/ode/threading/DxThreadingImplementation.java +++ b/core/src/main/java/org/ode4j/ode/threading/DxThreadingImplementation.java @@ -81,8 +81,8 @@ public abstract class DxThreadingImplementation extends DThreadingImplementation * * @return ID of object allocated or NULL on failure * - * @see DThreadingImplementation#allocateMultiThreadedImplementation() - * @see DThreadingImplementation#freeImplementation() + * @see DxThreadingImplementation#dThreadingAllocateMultiThreadedImplementation() + * @see DThreadingImplementation#free() */ /*ODE_API */ // public static DThreadingImplementation dThreadingAllocateSelfThreadedImplementation() {