Revision: 47130
http://brlcad.svn.sourceforge.net/brlcad/?rev=47130&view=rev
Author: abhi2011
Date: 2011-10-06 01:07:32 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Related changes to simulate command to use the raytraced manifolds
Modified Paths:
--------------
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/libged/simulate/simulate.c
brlcad/trunk/src/libged/simulate/simulate.h
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt 2011-10-06 01:01:24 UTC (rev
47129)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2011-10-06 01:07:32 UTC (rev
47130)
@@ -22,10 +22,10 @@
# verification (sh/cmakecheck.sh) will fail on dist-hook.
IF(BULLET_FOUND)
GED_ADD_CMD(LIBGED_SIM_SOURCES BULLET_INCLUDE_DIR BULLET_LIBRARIES)
- SET(SIM_SRCS simulate/simphysics.cpp simulate/simulate.c
simulate/simcollisionalgo.cpp simulate/simutils.h simulate/simutils.c)
+ SET(SIM_SRCS simulate/simphysics.cpp simulate/simulate.c
simulate/simcollisionalgo.cpp simulate/simutils.h simulate/simutils.c
simulate/simrt.c simulate/simrt.h)
ELSE(BULLET_FOUND)
SET(SIM_SRCS "")
- SET(ged_ignore_files simulate/simphysics.cpp simulate/simulate.c
simulate/simcollisionalgo.cpp simulate/simcollisionalgo.h simulate/simutils.h
simulate/simutils.c)
+ SET(ged_ignore_files simulate/simphysics.cpp simulate/simulate.c
simulate/simcollisionalgo.cpp simulate/simcollisionalgo.h simulate/simutils.h
simulate/simutils.c simulate/simrt.c simulate/simrt.h)
ENDIF(BULLET_FOUND)
set(LIBGED_SOURCES
@@ -350,6 +350,7 @@
simulate/simulate.h
simulate/simcollisionalgo.h
simulate/simutils.h
+ simulate/simrt.h
wdb_qray.h
)
CMAKEFILES(${ged_ignore_files})
Modified: brlcad/trunk/src/libged/simulate/simulate.c
===================================================================
--- brlcad/trunk/src/libged/simulate/simulate.c 2011-10-06 01:01:24 UTC (rev
47129)
+++ brlcad/trunk/src/libged/simulate/simulate.c 2011-10-06 01:07:32 UTC (rev
47130)
@@ -45,6 +45,7 @@
#include "../ged_private.h"
#include "simulate.h"
#include "simutils.h"
+#include "simrt.h"
/* The C++ simulation function */
@@ -433,9 +434,6 @@
/* Recreate sim.c to clear AABBs and manifold regions from previous
iteration */
recreate_sim_comb(gedp, &sim_params);
- /* Generate manifolds using rt */
- /* generate_manifolds(sim_params); */
-
/* Run the physics simulation */
rv = run_simulation(&sim_params);
if (rv != GED_OK) {
@@ -450,6 +448,9 @@
return GED_ERROR;
}
+ /* Generate manifolds using rt */
+ generate_manifolds(&sim_params);
+
free_manifold_lists(&sim_params);
}
Modified: brlcad/trunk/src/libged/simulate/simulate.h
===================================================================
--- brlcad/trunk/src/libged/simulate/simulate.h 2011-10-06 01:01:24 UTC (rev
47129)
+++ brlcad/trunk/src/libged/simulate/simulate.h 2011-10-06 01:07:32 UTC (rev
47130)
@@ -67,12 +67,12 @@
struct rigid_body {
int index;
char *rb_namep; /**< @brief pointer to name string */
- point_t bb_min; /**< @brief body min bb bounds */
- point_t bb_max; /**< @brief body max bb bounds */
+ point_t bb_min; /**< @brief body min bb bounds, only
calculated 1st time */
+ point_t bb_max; /**< @brief body max bb bounds, only
calculated 1st time */
point_t bb_center; /**< @brief bb center */
point_t bb_dims; /**< @brief bb dimensions */
- point_t btbb_min; /**< @brief Bullet body min bb bounds */
- point_t btbb_max; /**< @brief Bullet body max bb bounds */
+ point_t btbb_min; /**< @brief Bullet body min bb bounds,
updated after each iter. */
+ point_t btbb_max; /**< @brief Bullet body max bb bounds,
updated after each iter. */
point_t btbb_center; /**< @brief Bullet bb center */
point_t btbb_dims; /**< @brief Bullet bb dimensions */
mat_t m; /**< @brief transformation matrix from
Bullet */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
