glue: LICENSE, comments, and whitespace

stephengold · Jan 14, 2024 · 285084e · 285084e
1 parent 33897a9
commit 285084e
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 16 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 The src/main/java/com/jme3 and src/main/native/glue software
-are Copyright (c) 2009-2023 jMonkeyEngine
+are Copyright (c) 2009-2024 jMonkeyEngine
 All rights reserved.
 
 The src/main/native/v-hacd software except vhacdMutex.h

diff --git a/src/main/native/glue/com_jme3_bullet_collision_PhysicsCollisionObject.cpp b/src/main/native/glue/com_jme3_bullet_collision_PhysicsCollisionObject.cpp
@@ -701,6 +701,7 @@ JNIEXPORT void JNICALL Java_com_jme3_bullet_collision_PhysicsCollisionObject_ini
     pUser->m_groups = groups;
     pUser->m_jmeSpace = NULL;
     pUser->m_javaRef = pEnv->NewWeakGlobalRef(object); //dance041
+    // no check for exceptions!
 }
 
 /*

diff --git a/src/main/native/glue/com_jme3_bullet_collision_shapes_HeightfieldCollisionShape.cpp b/src/main/native/glue/com_jme3_bullet_collision_shapes_HeightfieldCollisionShape.cpp
@@ -45,7 +45,9 @@ ATTRIBUTE_ALIGNED16(class)
 HeightfieldShape : public btHeightfieldTerrainShape {
     public:
     BT_DECLARE_ALIGNED_ALLOCATOR();
-
+    /*
+     * constructor:
+     */
     HeightfieldShape(int heightStickWidth, int heightStickLength,
             const void *pHeightfieldData, btScalar heightScale,
             btScalar minHeight, btScalar maxHeight, int upAxis,

diff --git a/src/main/native/glue/com_jme3_bullet_objects_PhysicsGhostObject.cpp b/src/main/native/glue/com_jme3_bullet_objects_PhysicsGhostObject.cpp
@@ -45,7 +45,9 @@ class jmeGhostOverlapCallback : public btOverlapCallback {
     jobject m_object;
     btCollisionObject * m_ghost;
 public:
-
+    /*
+     * constructor:
+     */
     jmeGhostOverlapCallback(JNIEnv *pEnv, jobject object,
             btCollisionObject *pGhost)
     : m_env(pEnv),

diff --git a/src/main/native/glue/com_jme3_bullet_objects_infos_CharacterController.cpp b/src/main/native/glue/com_jme3_bullet_objects_infos_CharacterController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2023 jMonkeyEngine
+ * Copyright (c) 2009-2024 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,12 +47,14 @@
  */
 ATTRIBUTE_ALIGNED16(class)
 jmeKcc : public btKinematicCharacterController {
-    public:
+public:
     BT_DECLARE_ALIGNED_ALLOCATOR();
-
+    /*
+     * constructor:
+     */
     jmeKcc(btPairCachingGhostObject *ghost, btConvexShape *shape,
             btScalar stepHeight)
-            : btKinematicCharacterController(ghost, shape, stepHeight) {
+    : btKinematicCharacterController(ghost, shape, stepHeight) {
     }
 
     const btVector3 & getWalkOffset() const {

diff --git a/src/main/native/glue/com_jme3_bullet_objects_infos_VehicleController.cpp b/src/main/native/glue/com_jme3_bullet_objects_infos_VehicleController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021 jMonkeyEngine
+ * Copyright (c) 2009-2024 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -139,7 +139,7 @@ JNIEXPORT jlong JNICALL Java_com_jme3_bullet_objects_infos_VehicleController_cre
     pBody->setActivationState(DISABLE_DEACTIVATION);
 
     btVehicleRaycaster * const
-            pCaster = new btDefaultVehicleRaycaster(pWorld); //dance033 TODO leak
+            pCaster = new btDefaultVehicleRaycaster(pWorld); // TODO leak
     btRaycastVehicle * const
             pController = new btRaycastVehicle(*pTuning, pBody, pCaster); //dance032
 

diff --git a/src/main/native/glue/com_jme3_bullet_util_DebugShapeFactory.cpp b/src/main/native/glue/com_jme3_bullet_util_DebugShapeFactory.cpp
@@ -41,7 +41,9 @@ class DebugCallback : public btTriangleCallback, public btInternalTriangleIndexC
 public:
     JNIEnv *pEnv;
     jobject callback;
-
+    /*
+     * constructor:
+     */
     DebugCallback(JNIEnv *pEnv, jobject object) {
         this->pEnv = pEnv;
         this->callback = object;

diff --git a/src/main/native/glue/jmePhysicsSoftSpace.h b/src/main/native/glue/jmePhysicsSoftSpace.h
@@ -41,7 +41,9 @@
  */
 class jmePhysicsSoftSpace : public jmePhysicsSpace {
 public:
-
+    /*
+     * constructor:
+     */
     jmePhysicsSoftSpace(JNIEnv *env, jobject javaSpace)
     : jmePhysicsSpace(env, javaSpace) {
     }

diff --git a/src/main/native/glue/jmePhysicsSpace.h b/src/main/native/glue/jmePhysicsSpace.h
@@ -49,7 +49,6 @@ class jmePhysicsSpace : public jmeCollisionSpace {
     modify();
 
 public:
-
     /*
      * constructor:
      */

diff --git a/src/main/native/glue/vhacd4_Vhacd4.cpp b/src/main/native/glue/vhacd4_Vhacd4.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 jMonkeyEngine
+ * Copyright (c) 2020-2024 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,9 @@ using namespace VHACD;
 class Callback4 : public IVHACD::IUserCallback {
 public:
     JNIEnv *pEnv;
-
+    /*
+     * constructor:
+     */
     Callback4(JNIEnv *pJNIEnv) {
         pEnv = pJNIEnv;
     }

diff --git a/src/main/native/glue/vhacd_VHACD.cpp b/src/main/native/glue/vhacd_VHACD.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 jMonkeyEngine
+ * Copyright (c) 2020-2024 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,9 @@ using namespace VHACD;
 class Callback : public IVHACD::IUserCallback {
 public:
     JNIEnv *pEnv;
-
+    /*
+     * constructor:
+     */
     Callback(JNIEnv *pJNIEnv) {
         pEnv = pJNIEnv;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,6 @@ class jmePhysicsSpace : public jmeCollisionSpace { @@
         modify();
     public:
         /*
          * constructor:
          */
@@ Expand Down @@