You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-18 14:21:41 +00:00
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
@@ -27,76 +27,73 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
#include "world.h"
|
||||
#include "scene/3d/camera.h"
|
||||
#include "scene/3d/visibility_notifier.h"
|
||||
#include "scene/3d/spatial_indexer.h"
|
||||
#include "scene/scene_string_names.h"
|
||||
#include "octree.h"
|
||||
#include "camera_matrix.h"
|
||||
#include "octree.h"
|
||||
#include "scene/3d/camera.h"
|
||||
#include "scene/3d/spatial_indexer.h"
|
||||
#include "scene/3d/visibility_notifier.h"
|
||||
#include "scene/scene_string_names.h"
|
||||
|
||||
struct SpatialIndexer {
|
||||
|
||||
|
||||
Octree<VisibilityNotifier> octree;
|
||||
|
||||
struct NotifierData {
|
||||
|
||||
AABB aabb;
|
||||
OctreeElementID id;
|
||||
|
||||
};
|
||||
|
||||
Map<VisibilityNotifier*,NotifierData> notifiers;
|
||||
Map<VisibilityNotifier *, NotifierData> notifiers;
|
||||
struct CameraData {
|
||||
|
||||
Map<VisibilityNotifier*,uint64_t> notifiers;
|
||||
Map<VisibilityNotifier *, uint64_t> notifiers;
|
||||
};
|
||||
|
||||
Map<Camera*,CameraData> cameras;
|
||||
Map<Camera *, CameraData> cameras;
|
||||
|
||||
enum {
|
||||
VISIBILITY_CULL_MAX=32768
|
||||
VISIBILITY_CULL_MAX = 32768
|
||||
};
|
||||
|
||||
Vector<VisibilityNotifier*> cull;
|
||||
Vector<VisibilityNotifier *> cull;
|
||||
|
||||
bool changed;
|
||||
uint64_t pass;
|
||||
uint64_t last_frame;
|
||||
|
||||
void _notifier_add(VisibilityNotifier* p_notifier,const AABB& p_rect) {
|
||||
void _notifier_add(VisibilityNotifier *p_notifier, const AABB &p_rect) {
|
||||
|
||||
ERR_FAIL_COND(notifiers.has(p_notifier));
|
||||
notifiers[p_notifier].aabb=p_rect;
|
||||
notifiers[p_notifier].id = octree.create(p_notifier,p_rect);
|
||||
changed=true;
|
||||
|
||||
notifiers[p_notifier].aabb = p_rect;
|
||||
notifiers[p_notifier].id = octree.create(p_notifier, p_rect);
|
||||
changed = true;
|
||||
}
|
||||
|
||||
void _notifier_update(VisibilityNotifier* p_notifier,const AABB& p_rect) {
|
||||
void _notifier_update(VisibilityNotifier *p_notifier, const AABB &p_rect) {
|
||||
|
||||
Map<VisibilityNotifier*,NotifierData>::Element *E=notifiers.find(p_notifier);
|
||||
Map<VisibilityNotifier *, NotifierData>::Element *E = notifiers.find(p_notifier);
|
||||
ERR_FAIL_COND(!E);
|
||||
if (E->get().aabb==p_rect)
|
||||
if (E->get().aabb == p_rect)
|
||||
return;
|
||||
|
||||
E->get().aabb=p_rect;
|
||||
octree.move(E->get().id,E->get().aabb);
|
||||
changed=true;
|
||||
E->get().aabb = p_rect;
|
||||
octree.move(E->get().id, E->get().aabb);
|
||||
changed = true;
|
||||
}
|
||||
|
||||
void _notifier_remove(VisibilityNotifier* p_notifier) {
|
||||
void _notifier_remove(VisibilityNotifier *p_notifier) {
|
||||
|
||||
Map<VisibilityNotifier*,NotifierData>::Element *E=notifiers.find(p_notifier);
|
||||
Map<VisibilityNotifier *, NotifierData>::Element *E = notifiers.find(p_notifier);
|
||||
ERR_FAIL_COND(!E);
|
||||
|
||||
octree.erase(E->get().id);
|
||||
notifiers.erase(p_notifier);
|
||||
|
||||
List<Camera*> removed;
|
||||
for (Map<Camera*,CameraData>::Element*F=cameras.front();F;F=F->next()) {
|
||||
List<Camera *> removed;
|
||||
for (Map<Camera *, CameraData>::Element *F = cameras.front(); F; F = F->next()) {
|
||||
|
||||
Map<VisibilityNotifier*,uint64_t>::Element*G=F->get().notifiers.find(p_notifier);
|
||||
Map<VisibilityNotifier *, uint64_t>::Element *G = F->get().notifiers.find(p_notifier);
|
||||
|
||||
if (G) {
|
||||
F->get().notifiers.erase(G);
|
||||
@@ -104,170 +101,154 @@ struct SpatialIndexer {
|
||||
}
|
||||
}
|
||||
|
||||
while(!removed.empty()) {
|
||||
while (!removed.empty()) {
|
||||
|
||||
p_notifier->_exit_camera(removed.front()->get());
|
||||
removed.pop_front();
|
||||
}
|
||||
|
||||
|
||||
changed=true;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
void _add_camera(Camera* p_camera) {
|
||||
void _add_camera(Camera *p_camera) {
|
||||
|
||||
ERR_FAIL_COND(cameras.has(p_camera));
|
||||
CameraData vd;
|
||||
cameras[p_camera]=vd;
|
||||
changed=true;
|
||||
|
||||
cameras[p_camera] = vd;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
void _update_camera(Camera* p_camera) {
|
||||
void _update_camera(Camera *p_camera) {
|
||||
|
||||
Map<Camera*,CameraData>::Element *E= cameras.find(p_camera);
|
||||
Map<Camera *, CameraData>::Element *E = cameras.find(p_camera);
|
||||
ERR_FAIL_COND(!E);
|
||||
changed=true;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
void _remove_camera(Camera* p_camera) {
|
||||
void _remove_camera(Camera *p_camera) {
|
||||
ERR_FAIL_COND(!cameras.has(p_camera));
|
||||
List<VisibilityNotifier*> removed;
|
||||
for(Map<VisibilityNotifier*,uint64_t>::Element *E=cameras[p_camera].notifiers.front();E;E=E->next()) {
|
||||
List<VisibilityNotifier *> removed;
|
||||
for (Map<VisibilityNotifier *, uint64_t>::Element *E = cameras[p_camera].notifiers.front(); E; E = E->next()) {
|
||||
|
||||
removed.push_back(E->key());
|
||||
}
|
||||
|
||||
while(!removed.empty()) {
|
||||
while (!removed.empty()) {
|
||||
removed.front()->get()->_exit_camera(p_camera);
|
||||
removed.pop_front();
|
||||
}
|
||||
|
||||
cameras.erase(p_camera);
|
||||
|
||||
}
|
||||
|
||||
void _update(uint64_t p_frame) {
|
||||
|
||||
if (p_frame==last_frame)
|
||||
if (p_frame == last_frame)
|
||||
return;
|
||||
last_frame=p_frame;
|
||||
last_frame = p_frame;
|
||||
|
||||
if (!changed)
|
||||
return;
|
||||
|
||||
|
||||
|
||||
for (Map<Camera*,CameraData>::Element *E=cameras.front();E;E=E->next()) {
|
||||
for (Map<Camera *, CameraData>::Element *E = cameras.front(); E; E = E->next()) {
|
||||
|
||||
pass++;
|
||||
|
||||
Camera *c=E->key();
|
||||
Camera *c = E->key();
|
||||
|
||||
Vector<Plane> planes = c->get_frustum();
|
||||
|
||||
int culled = octree.cull_convex(planes,cull.ptr(),cull.size());
|
||||
int culled = octree.cull_convex(planes, cull.ptr(), cull.size());
|
||||
|
||||
VisibilityNotifier **ptr = cull.ptr();
|
||||
|
||||
VisibilityNotifier**ptr=cull.ptr();
|
||||
List<VisibilityNotifier *> added;
|
||||
List<VisibilityNotifier *> removed;
|
||||
|
||||
List<VisibilityNotifier*> added;
|
||||
List<VisibilityNotifier*> removed;
|
||||
|
||||
for(int i=0;i<culled;i++) {
|
||||
for (int i = 0; i < culled; i++) {
|
||||
|
||||
//notifiers in frustum
|
||||
|
||||
Map<VisibilityNotifier*,uint64_t>::Element *H=E->get().notifiers.find(ptr[i]);
|
||||
Map<VisibilityNotifier *, uint64_t>::Element *H = E->get().notifiers.find(ptr[i]);
|
||||
if (!H) {
|
||||
|
||||
E->get().notifiers.insert(ptr[i],pass);
|
||||
E->get().notifiers.insert(ptr[i], pass);
|
||||
added.push_back(ptr[i]);
|
||||
} else {
|
||||
H->get()=pass;
|
||||
H->get() = pass;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
for (Map<VisibilityNotifier*,uint64_t>::Element *F=E->get().notifiers.front();F;F=F->next()) {
|
||||
for (Map<VisibilityNotifier *, uint64_t>::Element *F = E->get().notifiers.front(); F; F = F->next()) {
|
||||
|
||||
if (F->get()!=pass)
|
||||
if (F->get() != pass)
|
||||
removed.push_back(F->key());
|
||||
}
|
||||
|
||||
while(!added.empty()) {
|
||||
while (!added.empty()) {
|
||||
added.front()->get()->_enter_camera(E->key());
|
||||
added.pop_front();
|
||||
}
|
||||
|
||||
while(!removed.empty()) {
|
||||
while (!removed.empty()) {
|
||||
E->get().notifiers.erase(removed.front()->get());
|
||||
removed.front()->get()->_exit_camera(E->key());
|
||||
removed.pop_front();
|
||||
}
|
||||
}
|
||||
changed=false;
|
||||
changed = false;
|
||||
}
|
||||
|
||||
|
||||
SpatialIndexer() {
|
||||
|
||||
pass=0;
|
||||
last_frame=0;
|
||||
changed=false;
|
||||
pass = 0;
|
||||
last_frame = 0;
|
||||
changed = false;
|
||||
cull.resize(VISIBILITY_CULL_MAX);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
void World::_register_camera(Camera* p_camera) {
|
||||
void World::_register_camera(Camera *p_camera) {
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
indexer->_add_camera(p_camera);
|
||||
#endif
|
||||
}
|
||||
|
||||
void World::_update_camera(Camera* p_camera){
|
||||
void World::_update_camera(Camera *p_camera) {
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
indexer->_update_camera(p_camera);
|
||||
#endif
|
||||
}
|
||||
void World::_remove_camera(Camera* p_camera){
|
||||
void World::_remove_camera(Camera *p_camera) {
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
indexer->_remove_camera(p_camera);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void World::_register_notifier(VisibilityNotifier* p_notifier,const AABB& p_rect){
|
||||
void World::_register_notifier(VisibilityNotifier *p_notifier, const AABB &p_rect) {
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
indexer->_notifier_add(p_notifier,p_rect);
|
||||
indexer->_notifier_add(p_notifier, p_rect);
|
||||
#endif
|
||||
}
|
||||
|
||||
void World::_update_notifier(VisibilityNotifier* p_notifier,const AABB& p_rect){
|
||||
void World::_update_notifier(VisibilityNotifier *p_notifier, const AABB &p_rect) {
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
indexer->_notifier_update(p_notifier,p_rect);
|
||||
indexer->_notifier_update(p_notifier, p_rect);
|
||||
#endif
|
||||
}
|
||||
|
||||
void World::_remove_notifier(VisibilityNotifier* p_notifier){
|
||||
void World::_remove_notifier(VisibilityNotifier *p_notifier) {
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
indexer->_notifier_remove(p_notifier);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void World::_update(uint64_t p_frame) {
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
@@ -275,30 +256,26 @@ void World::_update(uint64_t p_frame) {
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
RID World::get_space() const {
|
||||
|
||||
return space;
|
||||
}
|
||||
RID World::get_scenario() const{
|
||||
RID World::get_scenario() const {
|
||||
|
||||
return scenario;
|
||||
}
|
||||
RID World::get_sound_space() const{
|
||||
RID World::get_sound_space() const {
|
||||
|
||||
return sound_space;
|
||||
}
|
||||
|
||||
void World::set_environment(const Ref<Environment>& p_environment) {
|
||||
void World::set_environment(const Ref<Environment> &p_environment) {
|
||||
|
||||
environment=p_environment;
|
||||
environment = p_environment;
|
||||
if (environment.is_valid())
|
||||
VS::get_singleton()->scenario_set_environment(scenario,environment->get_rid());
|
||||
VS::get_singleton()->scenario_set_environment(scenario, environment->get_rid());
|
||||
else
|
||||
VS::get_singleton()->scenario_set_environment(scenario,RID());
|
||||
VS::get_singleton()->scenario_set_environment(scenario, RID());
|
||||
}
|
||||
|
||||
Ref<Environment> World::get_environment() const {
|
||||
@@ -306,7 +283,6 @@ Ref<Environment> World::get_environment() const {
|
||||
return environment;
|
||||
}
|
||||
|
||||
|
||||
PhysicsDirectSpaceState *World::get_direct_space_state() {
|
||||
|
||||
return PhysicsServer::get_singleton()->space_get_direct_state(space);
|
||||
@@ -314,33 +290,31 @@ PhysicsDirectSpaceState *World::get_direct_space_state() {
|
||||
|
||||
void World::_bind_methods() {
|
||||
|
||||
ObjectTypeDB::bind_method(_MD("get_space"),&World::get_space);
|
||||
ObjectTypeDB::bind_method(_MD("get_scenario"),&World::get_scenario);
|
||||
ObjectTypeDB::bind_method(_MD("get_sound_space"),&World::get_sound_space);
|
||||
ObjectTypeDB::bind_method(_MD("set_environment","env:Environment"),&World::set_environment);
|
||||
ObjectTypeDB::bind_method(_MD("get_environment:Environment"),&World::get_environment);
|
||||
ObjectTypeDB::bind_method(_MD("get_direct_space_state:PhysicsDirectSpaceState"),&World::get_direct_space_state);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"environment",PROPERTY_HINT_RESOURCE_TYPE,"Environment"),_SCS("set_environment"),_SCS("get_environment"));
|
||||
|
||||
ObjectTypeDB::bind_method(_MD("get_space"), &World::get_space);
|
||||
ObjectTypeDB::bind_method(_MD("get_scenario"), &World::get_scenario);
|
||||
ObjectTypeDB::bind_method(_MD("get_sound_space"), &World::get_sound_space);
|
||||
ObjectTypeDB::bind_method(_MD("set_environment", "env:Environment"), &World::set_environment);
|
||||
ObjectTypeDB::bind_method(_MD("get_environment:Environment"), &World::get_environment);
|
||||
ObjectTypeDB::bind_method(_MD("get_direct_space_state:PhysicsDirectSpaceState"), &World::get_direct_space_state);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), _SCS("set_environment"), _SCS("get_environment"));
|
||||
}
|
||||
|
||||
|
||||
World::World() {
|
||||
|
||||
space = PhysicsServer::get_singleton()->space_create();
|
||||
scenario = VisualServer::get_singleton()->scenario_create();
|
||||
sound_space = SpatialSoundServer::get_singleton()->space_create();
|
||||
|
||||
PhysicsServer::get_singleton()->space_set_active(space,true);
|
||||
PhysicsServer::get_singleton()->area_set_param(space,PhysicsServer::AREA_PARAM_GRAVITY,GLOBAL_DEF("physics/default_gravity",9.8));
|
||||
PhysicsServer::get_singleton()->area_set_param(space,PhysicsServer::AREA_PARAM_GRAVITY_VECTOR,GLOBAL_DEF("physics/default_gravity_vector",Vector3(0,-1,0)));
|
||||
PhysicsServer::get_singleton()->area_set_param(space,PhysicsServer::AREA_PARAM_LINEAR_DAMP,GLOBAL_DEF("physics/default_linear_damp",0.1));
|
||||
PhysicsServer::get_singleton()->area_set_param(space,PhysicsServer::AREA_PARAM_ANGULAR_DAMP,GLOBAL_DEF("physics/default_angular_damp",0.1));
|
||||
PhysicsServer::get_singleton()->space_set_active(space, true);
|
||||
PhysicsServer::get_singleton()->area_set_param(space, PhysicsServer::AREA_PARAM_GRAVITY, GLOBAL_DEF("physics/default_gravity", 9.8));
|
||||
PhysicsServer::get_singleton()->area_set_param(space, PhysicsServer::AREA_PARAM_GRAVITY_VECTOR, GLOBAL_DEF("physics/default_gravity_vector", Vector3(0, -1, 0)));
|
||||
PhysicsServer::get_singleton()->area_set_param(space, PhysicsServer::AREA_PARAM_LINEAR_DAMP, GLOBAL_DEF("physics/default_linear_damp", 0.1));
|
||||
PhysicsServer::get_singleton()->area_set_param(space, PhysicsServer::AREA_PARAM_ANGULAR_DAMP, GLOBAL_DEF("physics/default_angular_damp", 0.1));
|
||||
|
||||
#ifdef _3D_DISABLED
|
||||
indexer = NULL;
|
||||
#else
|
||||
indexer = memnew( SpatialIndexer );
|
||||
indexer = memnew(SpatialIndexer);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -351,8 +325,6 @@ World::~World() {
|
||||
SpatialSoundServer::get_singleton()->free(sound_space);
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
memdelete( indexer );
|
||||
memdelete(indexer);
|
||||
#endif
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user