seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Light Baker!

Browse Source 
-=-=-=-=-=-=

-Support for lightmap baker, have fun figuring out how it works before tutorial is published.
This commit is contained in:
Juan Linietsky
2014-06-11 10:41:03 -03:00
parent 6f0b4678e2
commit 9b8696d3dd
61 changed files with 4252 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
servers/visual/rasterizer.h
View File

@ -302,6 +302,11 @@ public:
virtual void multimesh_set_visible_instances(RID p_multimesh,int p_visible)=0;
virtual int multimesh_get_visible_instances(RID p_multimesh) const=0;
/* BAKED LIGHT */
/* IMMEDIATE API */
virtual RID immediate_create()=0;
@ -490,6 +495,20 @@ public:
typedef Map<StringName,Variant> ParamOverrideMap;
struct BakedLightData {
VS::BakedLightMode mode;
RID octree_texture;
float color_multiplier; //used for both lightmaps and octree
Transform octree_transform;
Map<int,RID> lightmaps;
//cache
float octree_lattice_size;
float octree_lattice_divide;
int octree_steps;
Vector2 octree_tex_pixel_size;
};
struct InstanceData {
@ -498,6 +517,8 @@ public:
RID material_override;
Vector<RID> light_instances;
Vector<float> morph_values;
BakedLightData *baked_light;
Transform *baked_light_octree_xform;
bool mirror :8;
bool depth_scale :8;
bool billboard :8;

309
servers/visual/visual_server_raster.cpp
View File

@ -31,6 +31,7 @@
#include "globals.h"
#include "default_mouse_cursor.xpm"
#include "sort.h"
#include "io/marshalls.h"
// careful, these may run in different threads than the visual server
BalloonAllocator<> *VisualServerRaster::OctreeAllocator::allocator=NULL;
@ -921,6 +922,7 @@ void VisualServerRaster::room_set_bounds(RID p_room, const BSP_Tree& p_bounds) {
Room *room = room_owner.get(p_room);
ERR_FAIL_COND(!room);
room->bounds=p_bounds;
_dependency_queue_update(p_room,true);
}
@ -1032,6 +1034,138 @@ float VisualServerRaster::portal_get_connect_range(RID p_portal) const {
}
RID VisualServerRaster::baked_light_create() {
BakedLight *baked_light = memnew( BakedLight );
ERR_FAIL_COND_V(!baked_light,RID());
baked_light->data.mode=BAKED_LIGHT_OCTREE;
baked_light->data.octree_lattice_size=0;
baked_light->data.octree_lattice_divide=0;
baked_light->data.octree_steps=1;
return baked_light_owner.make_rid( baked_light );
}
void VisualServerRaster::baked_light_set_mode(RID p_baked_light,BakedLightMode p_mode){
VS_CHANGED;
BakedLight *baked_light = baked_light_owner.get(p_baked_light);
ERR_FAIL_COND(!baked_light);
baked_light->data.mode=p_mode;
baked_light->data.color_multiplier=1.0;
_dependency_queue_update(p_baked_light,true);
}
VisualServer::BakedLightMode VisualServerRaster::baked_light_get_mode(RID p_baked_light) const{
const BakedLight *baked_light = baked_light_owner.get(p_baked_light);
ERR_FAIL_COND_V(!baked_light,BAKED_LIGHT_OCTREE);
return baked_light->data.mode;
}
void VisualServerRaster::baked_light_set_octree(RID p_baked_light,const DVector<uint8_t> p_octree){
VS_CHANGED;
BakedLight *baked_light = baked_light_owner.get(p_baked_light);
ERR_FAIL_COND(!baked_light);
if (p_octree.size()==0) {
if (baked_light->data.octree_texture.is_valid())
rasterizer->free(baked_light->data.octree_texture);
baked_light->data.octree_texture=RID();
baked_light->octree_aabb=AABB();
baked_light->octree_tex_size=Size2();
} else {
int tex_w;
int tex_h;
bool is16;
{
DVector<uint8_t>::Read r=p_octree.read();
tex_w = decode_uint32(&r[0]);
tex_h = decode_uint32(&r[4]);
print_line("TEX W: "+itos(tex_w)+" TEX H:"+itos(tex_h)+" LEN: "+itos(p_octree.size()));
is16=decode_uint32(&r[8]);
baked_light->data.octree_lattice_size=decode_float(&r[12]);
baked_light->data.octree_lattice_divide=tex_w/4.0;
print_line("LATTICE SIZE: "+rtos(baked_light->data.octree_lattice_size));
print_line("LATTICE DIVIDE: "+rtos(baked_light->data.octree_lattice_divide));
baked_light->data.octree_steps=decode_uint32(&r[16]);
baked_light->data.octree_tex_pixel_size.x=1.0/tex_w;
baked_light->data.octree_tex_pixel_size.y=1.0/tex_h;
baked_light->octree_aabb.pos.x=decode_float(&r[32]);
baked_light->octree_aabb.pos.y=decode_float(&r[36]);
baked_light->octree_aabb.pos.z=decode_float(&r[40]);
baked_light->octree_aabb.size.x=decode_float(&r[44]);
baked_light->octree_aabb.size.y=decode_float(&r[48]);
baked_light->octree_aabb.size.z=decode_float(&r[52]);
}
if (baked_light->data.octree_texture.is_valid()) {
if (tex_w!=baked_light->octree_tex_size.x || tex_h!=baked_light->octree_tex_size.y) {
rasterizer->free(baked_light->data.octree_texture);
baked_light->data.octree_texture=RID();
}
}
if (!baked_light->data.octree_texture.is_valid()) {
baked_light->data.octree_texture=rasterizer->texture_create();
rasterizer->texture_allocate(baked_light->data.octree_texture,tex_w,tex_h,Image::FORMAT_RGBA,TEXTURE_FLAG_FILTER);
}
Image img(tex_w,tex_h,0,Image::FORMAT_RGBA,p_octree);
rasterizer->texture_set_data(baked_light->data.octree_texture,img);
}
_dependency_queue_update(p_baked_light,true);
}
DVector<uint8_t> VisualServerRaster::baked_light_get_octree(RID p_baked_light) const{
BakedLight *baked_light = baked_light_owner.get(p_baked_light);
ERR_FAIL_COND_V(!baked_light,DVector<uint8_t>());
if (rasterizer->is_texture(baked_light->data.octree_texture)) {
Image img = rasterizer->texture_get_data(baked_light->data.octree_texture);
return img.get_data();
} else {
return DVector<uint8_t>();
}
}
void VisualServerRaster::baked_light_add_lightmap(RID p_baked_light,const RID p_texture,int p_id){
VS_CHANGED;
BakedLight *baked_light = baked_light_owner.get(p_baked_light);
ERR_FAIL_COND(!baked_light);
baked_light->data.lightmaps.insert(p_id,p_texture);
}
void VisualServerRaster::baked_light_clear_lightmaps(RID p_baked_light){
VS_CHANGED;
BakedLight *baked_light = baked_light_owner.get(p_baked_light);
ERR_FAIL_COND(!baked_light);
baked_light->data.lightmaps.clear();
}
/* CAMERA API */
RID VisualServerRaster::camera_create() {
@ -1710,6 +1844,23 @@ void VisualServerRaster::instance_set_base(RID p_instance, RID p_base) {
}
if (instance->baked_light_info) {
while(instance->baked_light_info->owned_instances.size()) {
Instance *owned=instance->baked_light_info->owned_instances.front()->get();
owned->baked_light=NULL;
owned->data.baked_light=NULL;
owned->data.baked_light_octree_xform=NULL;
owned->BLE=NULL;
instance->baked_light_info->owned_instances.pop_front();
}
memdelete(instance->baked_light_info);
instance->baked_light_info=NULL;
}
if (instance->scenario && instance->octree_id) {
instance->scenario->octree.erase( instance->octree_id );
instance->octree_id=0;
@ -1796,6 +1947,14 @@ void VisualServerRaster::instance_set_base(RID p_instance, RID p_base) {
instance->base_type=INSTANCE_PORTAL;
instance->portal_info = memnew(Instance::PortalInfo);
instance->portal_info->portal=portal_owner.get(p_base);
} else if (baked_light_owner.owns(p_base)) {
instance->base_type=INSTANCE_BAKED_LIGHT;
instance->baked_light_info=memnew(Instance::BakedLightInfo);
instance->baked_light_info->baked_light=baked_light_owner.get(p_base);
//instance->portal_info = memnew(Instance::PortalInfo);
//instance->portal_info->portal=portal_owner.get(p_base);
} else {
ERR_EXPLAIN("Invalid base RID for instance!")
ERR_FAIL();
@ -2365,6 +2524,68 @@ float VisualServerRaster::instance_geometry_get_draw_range_max(RID p_instance) c
}
void VisualServerRaster::instance_geometry_set_baked_light(RID p_instance,RID p_baked_light) {
VS_CHANGED;
Instance *instance = instance_owner.get( p_instance );
ERR_FAIL_COND( !instance );
if (instance->baked_light) {
instance->baked_light->baked_light_info->owned_instances.erase(instance->BLE);
instance->BLE=NULL;
instance->baked_light=NULL;
instance->data.baked_light=NULL;
instance->data.baked_light_octree_xform=NULL;
}
if (!p_baked_light.is_valid())
return;
Instance *bl_instance = instance_owner.get( p_baked_light );
ERR_FAIL_COND( !bl_instance );
ERR_FAIL_COND( bl_instance->base_type!=INSTANCE_BAKED_LIGHT );
instance->baked_light=bl_instance;
instance->BLE=bl_instance->baked_light_info->owned_instances.push_back(instance);
instance->data.baked_light=&bl_instance->baked_light_info->baked_light->data;
instance->data.baked_light_octree_xform=&bl_instance->baked_light_info->affine_inverse;
}
RID VisualServerRaster::instance_geometry_get_baked_light(RID p_instance) const{
const Instance *instance = instance_owner.get( p_instance );
ERR_FAIL_COND_V( !instance,RID() );
if (instance->baked_light)
instance->baked_light->self;
return RID();
}
void VisualServerRaster::instance_geometry_set_baked_light_texture_index(RID p_instance,int p_tex_id){
VS_CHANGED;
Instance *instance = instance_owner.get( p_instance );
ERR_FAIL_COND( !instance );
instance->lightmap_texture_index=p_tex_id;
}
int VisualServerRaster::instance_geometry_get_baked_light_texture_index(RID p_instance) const{
const Instance *instance = instance_owner.get( p_instance );
ERR_FAIL_COND_V( !instance,0 );
return instance->lightmap_texture_index;
}
void VisualServerRaster::_update_instance(Instance *p_instance) {
p_instance->version++;
@ -2385,7 +2606,7 @@ void VisualServerRaster::_update_instance(Instance *p_instance) {
}
if (p_instance->base_type&INSTANCE_GEOMETRY_MASK) {
if ((1<<p_instance->base_type)&INSTANCE_GEOMETRY_MASK) {
//make sure lights are updated
InstanceSet::Element *E=p_instance->lights.front();
@ -2395,13 +2616,20 @@ void VisualServerRaster::_update_instance(Instance *p_instance) {
E=E->next();
}
}
if (p_instance->base_type == INSTANCE_ROOM) {
} else if (p_instance->base_type == INSTANCE_ROOM) {
p_instance->room_info->affine_inverse=p_instance->data.transform.affine_inverse();
} else if (p_instance->base_type == INSTANCE_BAKED_LIGHT) {
Transform scale;
scale.basis.scale(p_instance->baked_light_info->baked_light->octree_aabb.size);
scale.origin=p_instance->baked_light_info->baked_light->octree_aabb.pos;
//print_line("scale: "+scale);
p_instance->baked_light_info->affine_inverse=(p_instance->data.transform*scale).affine_inverse();
}
p_instance->data.mirror = p_instance->data.transform.basis.determinant() < 0.0;
AABB new_aabb;
@ -2463,7 +2691,7 @@ void VisualServerRaster::_update_instance(Instance *p_instance) {
if (p_instance->base_type == INSTANCE_LIGHT) {
pairable_mask=INSTANCE_GEOMETRY_MASK;
pairable_mask=p_instance->light_info->enabled?INSTANCE_GEOMETRY_MASK:0;
pairable=true;
}
@ -2578,6 +2806,13 @@ void VisualServerRaster::_update_instance_aabb(Instance *p_instance) {
}
} break;
case VisualServer::INSTANCE_BAKED_LIGHT: {
BakedLight *baked_light = baked_light_owner.get( p_instance->base_rid );
ERR_FAIL_COND(!baked_light);
new_aabb=baked_light->octree_aabb;
} break;
default: {}
}
@ -2607,6 +2842,33 @@ void VisualServerRaster::_update_instances() {
}
}
void VisualServerRaster::instance_light_set_enabled(RID p_instance,bool p_enabled) {
VS_CHANGED;
Instance *instance = instance_owner.get( p_instance );
ERR_FAIL_COND( !instance );
ERR_FAIL_COND( instance->base_type!=INSTANCE_LIGHT );
if (p_enabled==instance->light_info->enabled)
return;
instance->light_info->enabled=p_enabled;
if (light_get_type(instance->base_rid)!=VS::LIGHT_DIRECTIONAL && instance->octree_id && instance->scenario)
instance->scenario->octree.set_pairable(instance->octree_id,p_enabled,1<<INSTANCE_LIGHT,p_enabled?INSTANCE_GEOMETRY_MASK:0);
//_instance_queue_update( instance , true );
}
bool VisualServerRaster::instance_light_is_enabled(RID p_instance) const {
const Instance *instance = instance_owner.get( p_instance );
ERR_FAIL_COND_V( !instance,false );
ERR_FAIL_COND_V( instance->base_type!=INSTANCE_LIGHT,false );
return instance->light_info->enabled;
}
/****** CANVAS *********/
RID VisualServerRaster::canvas_create() {
@ -3330,6 +3592,13 @@ void VisualServerRaster::black_bars_set_margins(int p_left, int p_top, int p_rig
black_margin[MARGIN_BOTTOM]=p_bottom;
}
void VisualServerRaster::black_bars_set_images(RID p_left, RID p_top, RID p_right, RID p_bottom) {
black_image[MARGIN_LEFT]=p_left;
black_image[MARGIN_TOP]=p_top;
black_image[MARGIN_RIGHT]=p_right;
black_image[MARGIN_BOTTOM]=p_bottom;
}
void VisualServerRaster::_free_attached_instances(RID p_rid,bool p_free_scenario) {
@ -3414,6 +3683,17 @@ void VisualServerRaster::free( RID p_rid ) {
portal_owner.free(p_rid);
memdelete(portal);
} else if (baked_light_owner.owns(p_rid)) {
_free_attached_instances(p_rid);
BakedLight *baked_light = baked_light_owner.get(p_rid);
ERR_FAIL_COND(!baked_light);
if (baked_light->data.octree_texture.is_valid())
rasterizer->free(baked_light->data.octree_texture);
baked_light_owner.free(p_rid);
memdelete(baked_light);
} else if (camera_owner.owns(p_rid)) {
// delete te camera
@ -3464,8 +3744,9 @@ void VisualServerRaster::free( RID p_rid ) {
instance_set_room(p_rid,RID());
instance_set_scenario(p_rid,RID());
instance_geometry_set_baked_light(p_rid,RID());
instance_set_base(p_rid,RID());
instance_owner.free(p_rid);
memdelete(instance);
@ -5101,7 +5382,7 @@ void VisualServerRaster::_render_camera(Viewport *p_viewport,Camera *p_camera, S
Instance *light = E->get().is_valid()?instance_owner.get(E->get()):NULL;
if (rasterizer->light_has_shadow(light->base_rid)) {
if (light && light->light_info->enabled && rasterizer->light_has_shadow(light->base_rid)) {
//rasterizer->light_instance_set_active_hint(light->light_info->instance);
_light_instance_update_shadow(light,p_scenario,p_camera,cull_range);
}
@ -5190,6 +5471,9 @@ void VisualServerRaster::_render_camera(Viewport *p_viewport,Camera *p_camera, S
Instance *light = E->get().is_valid()?instance_owner.get(E->get()):NULL;
ERR_CONTINUE(!light);
if (!light->light_info->enabled)
continue;
rasterizer->add_light(light->light_info->instance);
light->light_info->last_add_pass=render_pass;
}
@ -5694,9 +5978,16 @@ void VisualServerRaster::_draw_cursors_and_margins() {
rasterizer->canvas_draw_rect(Rect2(cursors[i].pos, size), 0, Rect2(), tex, Color(1, 1, 1, 1));
};
if (black_margin[MARGIN_LEFT])
if (black_image[MARGIN_LEFT].is_valid()) {
Size2 sz(rasterizer->texture_get_width(black_image[MARGIN_LEFT]),rasterizer->texture_get_height(black_image[MARGIN_LEFT]));
rasterizer->canvas_draw_rect(Rect2(0,0,black_margin[MARGIN_LEFT],window_h),0,Rect2(0,0,sz.x,sz.y),black_image[MARGIN_LEFT],Color(1,1,1));
} else if (black_margin[MARGIN_LEFT])
rasterizer->canvas_draw_rect(Rect2(0,0,black_margin[MARGIN_LEFT],window_h),0,Rect2(0,0,1,1),RID(),Color(0,0,0));
if (black_margin[MARGIN_RIGHT])
if (black_image[MARGIN_RIGHT].is_valid()) {
Size2 sz(rasterizer->texture_get_width(black_image[MARGIN_RIGHT]),rasterizer->texture_get_height(black_image[MARGIN_RIGHT]));
rasterizer->canvas_draw_rect(Rect2(window_w-black_margin[MARGIN_RIGHT],0,black_margin[MARGIN_RIGHT],window_h),0,Rect2(0,0,sz.x,sz.y),black_image[MARGIN_RIGHT],Color(1,1,1));
} else if (black_margin[MARGIN_RIGHT])
rasterizer->canvas_draw_rect(Rect2(window_w-black_margin[MARGIN_RIGHT],0,black_margin[MARGIN_RIGHT],window_h),0,Rect2(0,0,1,1),RID(),Color(0,0,0));
if (black_margin[MARGIN_TOP])
rasterizer->canvas_draw_rect(Rect2(0,0,window_w,black_margin[MARGIN_TOP]),0,Rect2(0,0,1,1),RID(),Color(0,0,0));

57
servers/visual/visual_server_raster.h
View File

@ -87,6 +87,14 @@ class VisualServerRaster : public VisualServer {
Portal() { enabled=true; disable_distance=50; disable_color=Color(); connect_range=0.8; }
};
struct BakedLight {
Rasterizer::BakedLightData data;
AABB octree_aabb;
Size2i octree_tex_size;
};
struct Camera {
@ -149,6 +157,7 @@ class VisualServerRaster : public VisualServer {
float draw_range_begin;
float draw_range_end;
float extra_margin;
int lightmap_texture_index;
Rasterizer::InstanceData data;
@ -158,6 +167,8 @@ class VisualServerRaster : public VisualServer {
Set<Instance*> valid_auto_rooms;
Instance *room;
List<Instance*>::Element *RE;
Instance *baked_light;
List<Instance*>::Element *BLE;
bool exterior;
uint64_t last_render_pass;
@ -205,6 +216,7 @@ class VisualServerRaster : public VisualServer {
uint64_t last_add_pass;
List<RID>::Element *D; // directional light in scenario
InstanceSet affected;
bool enabled;
float dtc; //distance to camera, used for sorting
@ -213,8 +225,16 @@ class VisualServerRaster : public VisualServer {
D=NULL;
light_set_index=-1;
last_add_pass=0;
enabled=true;
}
};
struct BakedLightInfo {
BakedLight *baked_light;
Transform affine_inverse;
List<Instance*> owned_instances;
};
struct ParticlesInfo {
@ -226,6 +246,7 @@ class VisualServerRaster : public VisualServer {
LightInfo *light_info;
ParticlesInfo *particles_info;
PortalInfo * portal_info;
BakedLightInfo * baked_light_info;
Instance() {
@ -244,6 +265,8 @@ class VisualServerRaster : public VisualServer {
data.depth_scale=false;
data.billboard=false;
data.billboard_y=false;
data.baked_light=NULL;
data.baked_light_octree_xform=NULL;
version=1;
room_info=NULL;
room=NULL;
@ -255,6 +278,10 @@ class VisualServerRaster : public VisualServer {
draw_range_end=0;
extra_margin=0;
visible_in_all_rooms=false;
lightmap_texture_index=-1;
baked_light=NULL;
baked_light_info=NULL;
BLE=NULL;
light_cache_dirty=true;
@ -270,6 +297,8 @@ class VisualServerRaster : public VisualServer {
memdelete(room_info);
if (portal_info)
memdelete(portal_info);
if (baked_light_info)
memdelete(baked_light_info);
};
};
@ -570,6 +599,7 @@ class VisualServerRaster : public VisualServer {
bool light_discard_enabled;
bool shadows_enabled;
int black_margin[4];
RID black_image[4];
Vector<Vector3> aabb_random_points;
Vector<Vector3> transformed_aabb_random_points;
@ -596,7 +626,9 @@ class VisualServerRaster : public VisualServer {
mutable RID_Owner<Room> room_owner;
mutable RID_Owner<Portal> portal_owner;
mutable RID_Owner<BakedLight> baked_light_owner;
mutable RID_Owner<Camera> camera_owner;
mutable RID_Owner<Viewport> viewport_owner;
@ -902,8 +934,19 @@ public:
virtual void portal_set_connect_range(RID p_portal, float p_range);
virtual float portal_get_connect_range(RID p_portal) const;
/* BAKED LIGHT */
virtual RID baked_light_create();
virtual void baked_light_set_mode(RID p_baked_light,BakedLightMode p_mode);
virtual BakedLightMode baked_light_get_mode(RID p_baked_light) const;
virtual void baked_light_set_octree(RID p_baked_light,const DVector<uint8_t> p_octree);
virtual DVector<uint8_t> baked_light_get_octree(RID p_baked_light) const;
virtual void baked_light_add_lightmap(RID p_baked_light,const RID p_texture,int p_id);
virtual void baked_light_clear_lightmaps(RID p_baked_light);
/* CAMERA API */
virtual RID camera_create();
@ -1036,6 +1079,15 @@ public:
virtual float instance_geometry_get_draw_range_max(RID p_instance) const;
virtual float instance_geometry_get_draw_range_min(RID p_instance) const;
virtual void instance_geometry_set_baked_light(RID p_instance,RID p_baked_light);
virtual RID instance_geometry_get_baked_light(RID p_instance) const;
virtual void instance_geometry_set_baked_light_texture_index(RID p_instance,int p_tex_id);
virtual int instance_geometry_get_baked_light_texture_index(RID p_instance) const;
virtual void instance_light_set_enabled(RID p_instance,bool p_enabled);
virtual bool instance_light_is_enabled(RID p_instance) const;
/* CANVAS (2D) */
virtual RID canvas_create();
@ -1093,6 +1145,7 @@ public:
/* BLACK BARS */
virtual void black_bars_set_margins(int p_left, int p_top, int p_right, int p_bottom);
virtual void black_bars_set_images(RID p_left, RID p_top, RID p_right, RID p_bottom);
/* FREE */

20
servers/visual/visual_server_wrap_mt.h
View File

@ -879,6 +879,17 @@ public:
FUNC1RC(float,portal_get_connect_range,RID);
FUNC0R(RID,baked_light_create);
FUNC2(baked_light_set_mode,RID,BakedLightMode);
FUNC1RC(BakedLightMode,baked_light_get_mode,RID);
FUNC2(baked_light_set_octree,RID,DVector<uint8_t>);
FUNC1RC(DVector<uint8_t>,baked_light_get_octree,RID);
FUNC3(baked_light_add_lightmap,RID,RID,int);
FUNC1(baked_light_clear_lightmaps,RID);
/* CAMERA API */
@ -1014,6 +1025,14 @@ public:
FUNC1RC(float,instance_geometry_get_draw_range_max,RID);
FUNC1RC(float,instance_geometry_get_draw_range_min,RID);
FUNC2(instance_geometry_set_baked_light,RID, RID );
FUNC1RC(RID,instance_geometry_get_baked_light,RID);
FUNC2(instance_geometry_set_baked_light_texture_index,RID, int);
FUNC1RC(int,instance_geometry_get_baked_light_texture_index,RID);
FUNC2(instance_light_set_enabled,RID,bool);
FUNC1RC(bool,instance_light_is_enabled,RID);
/* CANVAS (2D) */
@ -1076,6 +1095,7 @@ public:
/* BLACK BARS */
FUNC4(black_bars_set_margins,int , int , int , int );
FUNC4(black_bars_set_images,RID , RID , RID , RID );
/* FREE */

2
servers/visual_server.cpp
View File

@ -145,6 +145,7 @@ RID VisualServer::_make_test_cube() {
tangents.push_back( normal_points[m_idx][0] );\
tangents.push_back( 1.0 );\
uvs.push_back( Vector3(uv_points[m_idx*2+0],uv_points[m_idx*2+1],0) );\
print_line(itos( (face_points[m_idx][0]>0?1:0)|(face_points[m_idx][1]>0?2:0)|(face_points[m_idx][2]>0?4:0)));\
vtx_idx++;\
for (int i=0;i<6;i++) {
@ -527,6 +528,7 @@ void VisualServer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("cursor_set_pos"),&VisualServer::cursor_set_pos);
ObjectTypeDB::bind_method(_MD("black_bars_set_margins","left","top","right","bottom"),&VisualServer::black_bars_set_margins);
ObjectTypeDB::bind_method(_MD("black_bars_set_images","left","top","right","bottom"),&VisualServer::black_bars_set_images);
ObjectTypeDB::bind_method(_MD("make_sphere_mesh"),&VisualServer::make_sphere_mesh);
ObjectTypeDB::bind_method(_MD("mesh_add_surface_from_planes"),&VisualServer::mesh_add_surface_from_planes);

29
servers/visual_server.h
View File

@ -576,6 +576,23 @@ public:
virtual float portal_get_connect_range(RID p_portal) const =0;
/* BAKED LIGHT API */
virtual RID baked_light_create()=0;
enum BakedLightMode {
BAKED_LIGHT_OCTREE,
BAKED_LIGHT_LIGHTMAPS
};
virtual void baked_light_set_mode(RID p_baked_light,BakedLightMode p_mode)=0;
virtual BakedLightMode baked_light_get_mode(RID p_baked_light) const=0;
virtual void baked_light_set_octree(RID p_baked_light,const DVector<uint8_t> p_octree)=0;
virtual DVector<uint8_t> baked_light_get_octree(RID p_baked_light) const=0;
virtual void baked_light_add_lightmap(RID p_baked_light,const RID p_texture,int p_id)=0;
virtual void baked_light_clear_lightmaps(RID p_baked_light)=0;
/* CAMERA API */
@ -792,6 +809,7 @@ public:
INSTANCE_LIGHT,
INSTANCE_ROOM,
INSTANCE_PORTAL,
INSTANCE_BAKED_LIGHT,
INSTANCE_GEOMETRY_MASK=(1<<INSTANCE_MESH)|(1<<INSTANCE_MULTIMESH)|(1<<INSTANCE_IMMEDIATE)|(1<<INSTANCE_PARTICLES)
};
@ -849,7 +867,7 @@ public:
INSTANCE_FLAG_RECEIVE_SHADOWS,
INSTANCE_FLAG_DEPH_SCALE,
INSTANCE_FLAG_VISIBLE_IN_ALL_ROOMS,
INSTANCE_FLAG_USE_BAKED_LIGHT_VOLUME,
INSTANCE_FLAG_USE_BAKED_LIGHT,
INSTANCE_FLAG_MAX
};
@ -863,6 +881,14 @@ public:
virtual float instance_geometry_get_draw_range_max(RID p_instance) const=0;
virtual float instance_geometry_get_draw_range_min(RID p_instance) const=0;
virtual void instance_geometry_set_baked_light(RID p_instance,RID p_baked_light)=0;
virtual RID instance_geometry_get_baked_light(RID p_instance) const=0;
virtual void instance_geometry_set_baked_light_texture_index(RID p_instance,int p_tex_id)=0;
virtual int instance_geometry_get_baked_light_texture_index(RID p_instance) const=0;
virtual void instance_light_set_enabled(RID p_instance,bool p_enabled)=0;
virtual bool instance_light_is_enabled(RID p_instance) const=0;
/* CANVAS (2D) */
@ -923,6 +949,7 @@ public:
virtual void black_bars_set_margins(int p_left, int p_top, int p_right, int p_bottom)=0;
virtual void black_bars_set_images(RID p_left, RID p_top, RID p_right, RID p_bottom)=0;
/* FREE */