Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 17:53:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching

Browse source
This commit is contained in:
Atlante45 2015-05-29 17:37:53 +02:00
commit 0384b74479
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities-renderer/CMakeLists.txt
View file

@ -12,4 +12,9 @@ find_package(Bullet REQUIRED)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
add_dependency_external_projects(polyvox)
find_package(PolyVox REQUIRED)
target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${POLYVOX_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${POLYVOX_LIBRARIES})
link_hifi_libraries(shared gpu script-engine render render-utils) link_hifi_libraries(shared gpu script-engine render render-utils)

6
libraries/entities/CMakeLists.txt
View file

@ -7,15 +7,11 @@ add_dependency_external_projects(glm)
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
add_dependency_external_projects(bullet polyvox) add_dependency_external_projects(bullet)
find_package(Bullet REQUIRED) find_package(Bullet REQUIRED)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
find_package(PolyVox REQUIRED)
target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${POLYVOX_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${POLYVOX_LIBRARIES})
link_hifi_libraries(avatars shared octree gpu model fbx networking animation environment) link_hifi_libraries(avatars shared octree gpu model fbx networking animation environment)
include_hifi_library_headers(render) include_hifi_library_headers(render)

13
libraries/entities/src/EntityItem.cpp
View file

@ -958,9 +958,6 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
#endif #endif
setLastEdited(now); setLastEdited(now);
somethingChangedNotification(); // notify derived classes that something has changed somethingChangedNotification(); // notify derived classes that something has changed
if (_created == UNKNOWN_CREATED_TIME) {
_created = now;
}
if (getDirtyFlags() & (EntityItem::DIRTY_TRANSFORM | EntityItem::DIRTY_VELOCITIES)) { if (getDirtyFlags() & (EntityItem::DIRTY_TRANSFORM | EntityItem::DIRTY_VELOCITIES)) {
// anything that sets the transform or velocity must update _lastSimulated which is used // anything that sets the transform or velocity must update _lastSimulated which is used
// for kinematic extrapolation (e.g. we want to extrapolate forward from this moment // for kinematic extrapolation (e.g. we want to extrapolate forward from this moment
@ -969,6 +966,16 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
} }
} }
// timestamps
quint64 timestamp = properties.getCreated();
if (_created == UNKNOWN_CREATED_TIME && timestamp != UNKNOWN_CREATED_TIME) {
quint64 now = usecTimestampNow();
if (timestamp > now) {
timestamp = now;
}
_created = timestamp;
}
return somethingChanged; return somethingChanged;
} }

2
tests/physics/src/MeshMassPropertiesTests.h
View file

@ -15,7 +15,7 @@ namespace MeshMassPropertiesTests{
void testParallelAxisTheorem(); void testParallelAxisTheorem();
void testTetrahedron(); void testTetrahedron();
void testOpenTetrahedonMesh(); void testOpenTetrahedonMesh();
void testClosedTetrahedronMesh(); void testClosedTetrahedronMesh();
void testBoxAsMesh(); void testBoxAsMesh();
void runAllTests(); void runAllTests();
} }