1
0
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
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions

View File

@@ -29,224 +29,193 @@
#include "multimesh.h"
#include "servers/visual_server.h"
void MultiMesh::_set_transform_array(const DVector<Vector3>& p_array) {
void MultiMesh::_set_transform_array(const DVector<Vector3> &p_array) {
int instance_count = get_instance_count();
DVector<Vector3> xforms = p_array;
int len=xforms.size();
ERR_FAIL_COND((len/4) != instance_count);
if (len==0)
int len = xforms.size();
ERR_FAIL_COND((len / 4) != instance_count);
if (len == 0)
return;
DVector<Vector3>::Read r = xforms.read();
for(int i=0;i<len/4;i++) {
for (int i = 0; i < len / 4; i++) {
Transform t;
t.basis[0]=r[i*4+0];
t.basis[1]=r[i*4+1];
t.basis[2]=r[i*4+2];
t.origin=r[i*4+3];
t.basis[0] = r[i * 4 + 0];
t.basis[1] = r[i * 4 + 1];
t.basis[2] = r[i * 4 + 2];
t.origin = r[i * 4 + 3];
set_instance_transform(i,t);
set_instance_transform(i, t);
}
}
DVector<Vector3> MultiMesh::_get_transform_array() const {
int instance_count = get_instance_count();
if (instance_count==0)
if (instance_count == 0)
return DVector<Vector3>();
DVector<Vector3> xforms;
xforms.resize(instance_count*4);
xforms.resize(instance_count * 4);
DVector<Vector3>::Write w = xforms.write();
for(int i=0;i<instance_count;i++) {
for (int i = 0; i < instance_count; i++) {
Transform t=get_instance_transform(i);
w[i*4+0]=t.basis[0];
w[i*4+1]=t.basis[1];
w[i*4+2]=t.basis[2];
w[i*4+3]=t.origin;
Transform t = get_instance_transform(i);
w[i * 4 + 0] = t.basis[0];
w[i * 4 + 1] = t.basis[1];
w[i * 4 + 2] = t.basis[2];
w[i * 4 + 3] = t.origin;
}
return xforms;
}
void MultiMesh::_set_color_array(const DVector<Color>& p_array) {
void MultiMesh::_set_color_array(const DVector<Color> &p_array) {
int instance_count = get_instance_count();
DVector<Color> colors = p_array;
int len=colors.size();
int len = colors.size();
ERR_FAIL_COND(len != instance_count);
if (len==0)
if (len == 0)
return;
DVector<Color>::Read r = colors.read();
for(int i=0;i<len;i++) {
for (int i = 0; i < len; i++) {
set_instance_color(i,r[i]);
set_instance_color(i, r[i]);
}
}
DVector<Color> MultiMesh::_get_color_array() const {
int instance_count = get_instance_count();
if (instance_count==0)
if (instance_count == 0)
return DVector<Color>();
DVector<Color> colors;
colors.resize(instance_count);
for(int i=0;i<instance_count;i++) {
for (int i = 0; i < instance_count; i++) {
colors.set(i,get_instance_color(i));
colors.set(i, get_instance_color(i));
}
return colors;
}
void MultiMesh::set_mesh(const Ref<Mesh> &p_mesh) {
void MultiMesh::set_mesh(const Ref<Mesh>& p_mesh) {
mesh=p_mesh;
mesh = p_mesh;
if (!mesh.is_null())
VisualServer::get_singleton()->multimesh_set_mesh(multimesh,mesh->get_rid());
VisualServer::get_singleton()->multimesh_set_mesh(multimesh, mesh->get_rid());
else
VisualServer::get_singleton()->multimesh_set_mesh(multimesh,RID());
VisualServer::get_singleton()->multimesh_set_mesh(multimesh, RID());
}
Ref<Mesh> MultiMesh::get_mesh() const {
return mesh;
}
void MultiMesh::set_instance_count(int p_count) {
VisualServer::get_singleton()->multimesh_set_instance_count(multimesh,p_count);
VisualServer::get_singleton()->multimesh_set_instance_count(multimesh, p_count);
}
int MultiMesh::get_instance_count() const {
return VisualServer::get_singleton()->multimesh_get_instance_count(multimesh);
}
void MultiMesh::set_instance_transform(int p_instance, const Transform& p_transform) {
VisualServer::get_singleton()->multimesh_instance_set_transform(multimesh,p_instance,p_transform);
void MultiMesh::set_instance_transform(int p_instance, const Transform &p_transform) {
VisualServer::get_singleton()->multimesh_instance_set_transform(multimesh, p_instance, p_transform);
}
Transform MultiMesh::get_instance_transform(int p_instance) const {
return VisualServer::get_singleton()->multimesh_instance_get_transform(multimesh,p_instance);
return VisualServer::get_singleton()->multimesh_instance_get_transform(multimesh, p_instance);
}
void MultiMesh::set_instance_color(int p_instance, const Color& p_color) {
VisualServer::get_singleton()->multimesh_instance_set_color(multimesh,p_instance,p_color);
void MultiMesh::set_instance_color(int p_instance, const Color &p_color) {
VisualServer::get_singleton()->multimesh_instance_set_color(multimesh, p_instance, p_color);
}
Color MultiMesh::get_instance_color(int p_instance) const {
return VisualServer::get_singleton()->multimesh_instance_get_color(multimesh,p_instance);
return VisualServer::get_singleton()->multimesh_instance_get_color(multimesh, p_instance);
}
void MultiMesh::set_aabb(const AABB& p_aabb) {
aabb=p_aabb;
VisualServer::get_singleton()->multimesh_set_aabb(multimesh,p_aabb);
void MultiMesh::set_aabb(const AABB &p_aabb) {
aabb = p_aabb;
VisualServer::get_singleton()->multimesh_set_aabb(multimesh, p_aabb);
}
AABB MultiMesh::get_aabb() const {
return aabb;
}
void MultiMesh::generate_aabb() {
ERR_EXPLAIN("Cannot generate AABB if mesh is null.");
ERR_FAIL_COND(mesh.is_null());
AABB base_aabb=mesh->get_aabb();
AABB base_aabb = mesh->get_aabb();
aabb=AABB();
aabb = AABB();
int instance_count = get_instance_count();
for(int i=0;i<instance_count;i++) {
for (int i = 0; i < instance_count; i++) {
Transform xform = get_instance_transform(i);
if(i==0)
aabb=xform.xform(base_aabb);
if (i == 0)
aabb = xform.xform(base_aabb);
else
aabb.merge_with(xform.xform(base_aabb));
}
set_aabb(aabb);
}
RID MultiMesh::get_rid() const {
return multimesh;
}
void MultiMesh::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_mesh","mesh:Mesh"),&MultiMesh::set_mesh);
ObjectTypeDB::bind_method(_MD("get_mesh:Mesh"),&MultiMesh::get_mesh);
ObjectTypeDB::bind_method(_MD("set_instance_count","count"),&MultiMesh::set_instance_count);
ObjectTypeDB::bind_method(_MD("get_instance_count"),&MultiMesh::get_instance_count);
ObjectTypeDB::bind_method(_MD("set_instance_transform","instance","transform"),&MultiMesh::set_instance_transform);
ObjectTypeDB::bind_method(_MD("get_instance_transform","instance"),&MultiMesh::get_instance_transform);
ObjectTypeDB::bind_method(_MD("set_instance_color","instance","color"),&MultiMesh::set_instance_color);
ObjectTypeDB::bind_method(_MD("get_instance_color","instance"),&MultiMesh::get_instance_color);
ObjectTypeDB::bind_method(_MD("set_aabb","visibility_aabb"),&MultiMesh::set_aabb);
ObjectTypeDB::bind_method(_MD("get_aabb"),&MultiMesh::get_aabb);
ObjectTypeDB::bind_method(_MD("set_mesh", "mesh:Mesh"), &MultiMesh::set_mesh);
ObjectTypeDB::bind_method(_MD("get_mesh:Mesh"), &MultiMesh::get_mesh);
ObjectTypeDB::bind_method(_MD("set_instance_count", "count"), &MultiMesh::set_instance_count);
ObjectTypeDB::bind_method(_MD("get_instance_count"), &MultiMesh::get_instance_count);
ObjectTypeDB::bind_method(_MD("set_instance_transform", "instance", "transform"), &MultiMesh::set_instance_transform);
ObjectTypeDB::bind_method(_MD("get_instance_transform", "instance"), &MultiMesh::get_instance_transform);
ObjectTypeDB::bind_method(_MD("set_instance_color", "instance", "color"), &MultiMesh::set_instance_color);
ObjectTypeDB::bind_method(_MD("get_instance_color", "instance"), &MultiMesh::get_instance_color);
ObjectTypeDB::bind_method(_MD("set_aabb", "visibility_aabb"), &MultiMesh::set_aabb);
ObjectTypeDB::bind_method(_MD("get_aabb"), &MultiMesh::get_aabb);
ObjectTypeDB::bind_method(_MD("generate_aabb"),&MultiMesh::generate_aabb);
ObjectTypeDB::bind_method(_MD("generate_aabb"), &MultiMesh::generate_aabb);
ObjectTypeDB::bind_method(_MD("_set_transform_array"),&MultiMesh::_set_transform_array);
ObjectTypeDB::bind_method(_MD("_get_transform_array"),&MultiMesh::_get_transform_array);
ObjectTypeDB::bind_method(_MD("_set_color_array"),&MultiMesh::_set_color_array);
ObjectTypeDB::bind_method(_MD("_get_color_array"),&MultiMesh::_get_color_array);
ADD_PROPERTY(PropertyInfo(Variant::INT,"instance_count",PROPERTY_HINT_RANGE,"0,16384,1"), _SCS("set_instance_count"), _SCS("get_instance_count"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"mesh",PROPERTY_HINT_RESOURCE_TYPE,"Mesh"), _SCS("set_mesh"), _SCS("get_mesh"));
ADD_PROPERTY(PropertyInfo(Variant::_AABB,"aabb"), _SCS("set_aabb"), _SCS("get_aabb") );
ADD_PROPERTY(PropertyInfo(Variant::VECTOR3_ARRAY,"transform_array",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), _SCS("_set_transform_array"), _SCS("_get_transform_array"));
ADD_PROPERTY(PropertyInfo(Variant::COLOR_ARRAY,"color_array",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), _SCS("_set_color_array"), _SCS("_get_color_array"));
ObjectTypeDB::bind_method(_MD("_set_transform_array"), &MultiMesh::_set_transform_array);
ObjectTypeDB::bind_method(_MD("_get_transform_array"), &MultiMesh::_get_transform_array);
ObjectTypeDB::bind_method(_MD("_set_color_array"), &MultiMesh::_set_color_array);
ObjectTypeDB::bind_method(_MD("_get_color_array"), &MultiMesh::_get_color_array);
ADD_PROPERTY(PropertyInfo(Variant::INT, "instance_count", PROPERTY_HINT_RANGE, "0,16384,1"), _SCS("set_instance_count"), _SCS("get_instance_count"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), _SCS("set_mesh"), _SCS("get_mesh"));
ADD_PROPERTY(PropertyInfo(Variant::_AABB, "aabb"), _SCS("set_aabb"), _SCS("get_aabb"));
ADD_PROPERTY(PropertyInfo(Variant::VECTOR3_ARRAY, "transform_array", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), _SCS("_set_transform_array"), _SCS("_get_transform_array"));
ADD_PROPERTY(PropertyInfo(Variant::COLOR_ARRAY, "color_array", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), _SCS("_set_color_array"), _SCS("_get_color_array"));
}
MultiMesh::MultiMesh() {