Remove inappropriate executable bits and minor reformat of code and changelog.
PiperOrigin-RevId: 416854656 Change-Id: I554d2c5667282567a129d79d91d8f2e97146d6f5
This commit is contained in:
@@ -22,10 +22,9 @@
|
||||
#if defined(_OPENMP)
|
||||
#include <omp.h>
|
||||
#else
|
||||
// omp timer replacement
|
||||
// omp timer replacement
|
||||
#include <chrono>
|
||||
double omp_get_wtime(void)
|
||||
{
|
||||
double omp_get_wtime(void) {
|
||||
static std::chrono::system_clock::time_point _start = std::chrono::system_clock::now();
|
||||
std::chrono::duration<double> elapsed = std::chrono::system_clock::now() - _start;
|
||||
return elapsed.count();
|
||||
@@ -34,8 +33,7 @@
|
||||
// omp functions used below
|
||||
void omp_set_dynamic(int) {}
|
||||
void omp_set_num_threads(int) {}
|
||||
int omp_get_num_procs(void)
|
||||
{
|
||||
int omp_get_num_procs(void) {
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
+11
-13
@@ -635,18 +635,16 @@ void watch(void) {
|
||||
MJDATA_POINTERS_PREAMBLE(m);
|
||||
|
||||
// find specified field in mjData arrays, update value
|
||||
#define X(TYPE, NAME, NR, NC) \
|
||||
if( !mju::strcmp_arr(#NAME, settings.field) && \
|
||||
!mju::strcmp_arr(#TYPE, "mjtNum") ) \
|
||||
{ \
|
||||
if( settings.index>=0 && settings.index<m->NR*NC ) \
|
||||
printfield(ui0.sect[SECT_WATCH].item[2].multi.name[0], \
|
||||
d->NAME + settings.index); \
|
||||
else \
|
||||
mju::strcpy_arr(ui0.sect[SECT_WATCH].item[2].multi.name[0], \
|
||||
"invalid index"); \
|
||||
return; \
|
||||
}
|
||||
#define X(TYPE, NAME, NR, NC) \
|
||||
if (!mju::strcmp_arr(#NAME, settings.field) && \
|
||||
!mju::strcmp_arr(#TYPE, "mjtNum")) { \
|
||||
if (settings.index>=0 && settings.index<m->NR*NC) { \
|
||||
printfield(ui0.sect[SECT_WATCH].item[2].multi.name[0], d->NAME + settings.index); \
|
||||
} else { \
|
||||
mju::strcpy_arr(ui0.sect[SECT_WATCH].item[2].multi.name[0], "invalid index"); \
|
||||
} \
|
||||
return; \
|
||||
}
|
||||
|
||||
MJDATA_POINTERS
|
||||
#undef X
|
||||
@@ -654,7 +652,7 @@ void watch(void) {
|
||||
|
||||
|
||||
|
||||
//-------------------------------- UI construction --------------------------------------
|
||||
//---------------------------------- UI construction -----------------------------------------------
|
||||
|
||||
// make physics section of UI
|
||||
void makephysics(int oldstate) {
|
||||
|
||||
Executable → Regular
Executable → Regular
Reference in New Issue
Block a user