|
|
@@ -2444,7 +2444,7 @@ void RendererSceneCull::render_camera(RID p_render_buffers, RID p_camera, RID p_
|
|
|
Transform3D transform = camera->transform;
|
|
|
CameraMatrix projection;
|
|
|
bool vaspect = camera->vaspect;
|
|
|
- bool is_ortogonal = false;
|
|
|
+ bool is_orthogonal = false;
|
|
|
|
|
|
switch (camera->type) {
|
|
|
case Camera::ORTHOGONAL: {
|
|
|
@@ -2454,7 +2454,7 @@ void RendererSceneCull::render_camera(RID p_render_buffers, RID p_camera, RID p_
|
|
|
camera->znear,
|
|
|
camera->zfar,
|
|
|
camera->vaspect);
|
|
|
- is_ortogonal = true;
|
|
|
+ is_orthogonal = true;
|
|
|
} break;
|
|
|
case Camera::PERSPECTIVE: {
|
|
|
projection.set_perspective(
|
|
|
@@ -2476,7 +2476,7 @@ void RendererSceneCull::render_camera(RID p_render_buffers, RID p_camera, RID p_
|
|
|
} break;
|
|
|
}
|
|
|
|
|
|
- camera_data.set_camera(transform, projection, is_ortogonal, vaspect);
|
|
|
+ camera_data.set_camera(transform, projection, is_orthogonal, vaspect);
|
|
|
} else {
|
|
|
// Setup our camera for our XR interface.
|
|
|
// We can support multiple views here each with their own camera
|
|
|
@@ -2510,7 +2510,7 @@ void RendererSceneCull::render_camera(RID p_render_buffers, RID p_camera, RID p_
|
|
|
|
|
|
RENDER_TIMESTAMP("Update Occlusion Buffer")
|
|
|
// For now just cull on the first camera
|
|
|
- RendererSceneOcclusionCull::get_singleton()->buffer_update(p_viewport, camera_data.main_transform, camera_data.main_projection, camera_data.is_ortogonal, RendererThreadPool::singleton->thread_work_pool);
|
|
|
+ RendererSceneOcclusionCull::get_singleton()->buffer_update(p_viewport, camera_data.main_transform, camera_data.main_projection, camera_data.is_orthogonal, RendererThreadPool::singleton->thread_work_pool);
|
|
|
|
|
|
_render_scene(&camera_data, p_render_buffers, environment, camera->effects, camera->visible_layers, p_scenario, p_viewport, p_shadow_atlas, RID(), -1, p_screen_mesh_lod_threshold, true, r_render_info);
|
|
|
#endif
|
|
|
@@ -2920,7 +2920,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
|
|
|
|
|
|
RENDER_TIMESTAMP("Cull 3D Scene");
|
|
|
|
|
|
- //rasterizer->set_camera(p_camera_data->main_transform, p_camera_data.main_projection, p_camera_data.is_ortogonal);
|
|
|
+ //rasterizer->set_camera(p_camera_data->main_transform, p_camera_data.main_projection, p_camera_data.is_orthogonal);
|
|
|
|
|
|
/* STEP 2 - CULL */
|
|
|
|
|
|
@@ -2959,7 +2959,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
|
|
|
scene_render->set_directional_shadow_count(lights_with_shadow.size());
|
|
|
|
|
|
for (int i = 0; i < lights_with_shadow.size(); i++) {
|
|
|
- _light_instance_setup_directional_shadow(i, lights_with_shadow[i], p_camera_data->main_transform, p_camera_data->main_projection, p_camera_data->is_ortogonal, p_camera_data->vaspect);
|
|
|
+ _light_instance_setup_directional_shadow(i, lights_with_shadow[i], p_camera_data->main_transform, p_camera_data->main_projection, p_camera_data->is_orthogonal, p_camera_data->vaspect);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -3097,7 +3097,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
|
|
|
ins->transform.origin + cam_xf.basis.get_axis(0) * radius
|
|
|
};
|
|
|
|
|
|
- if (!p_camera_data->is_ortogonal) {
|
|
|
+ if (!p_camera_data->is_orthogonal) {
|
|
|
//if using perspetive, map them to near plane
|
|
|
for (int j = 0; j < 2; j++) {
|
|
|
if (p.distance_to(points[j]) < 0) {
|
|
|
@@ -3125,7 +3125,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
|
|
|
base + cam_xf.basis.get_axis(0) * w
|
|
|
};
|
|
|
|
|
|
- if (!p_camera_data->is_ortogonal) {
|
|
|
+ if (!p_camera_data->is_orthogonal) {
|
|
|
//if using perspetive, map them to near plane
|
|
|
for (int j = 0; j < 2; j++) {
|
|
|
if (p.distance_to(points[j]) < 0) {
|
|
|
@@ -3156,7 +3156,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
|
|
|
if (redraw && max_shadows_used < MAX_UPDATE_SHADOWS) {
|
|
|
//must redraw!
|
|
|
RENDER_TIMESTAMP("> Render Light3D " + itos(i));
|
|
|
- light->shadow_dirty = _light_instance_update_shadow(ins, p_camera_data->main_transform, p_camera_data->main_projection, p_camera_data->is_ortogonal, p_camera_data->vaspect, p_shadow_atlas, scenario, p_screen_mesh_lod_threshold);
|
|
|
+ light->shadow_dirty = _light_instance_update_shadow(ins, p_camera_data->main_transform, p_camera_data->main_projection, p_camera_data->is_orthogonal, p_camera_data->vaspect, p_shadow_atlas, scenario, p_screen_mesh_lod_threshold);
|
|
|
RENDER_TIMESTAMP("< Render Light3D " + itos(i));
|
|
|
} else {
|
|
|
light->shadow_dirty = redraw;
|
|
|
@@ -3229,7 +3229,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
|
|
|
render_sdfgi_data[i].instances.clear();
|
|
|
}
|
|
|
|
|
|
- // virtual void render_scene(RID p_render_buffers, const Transform3D &p_cam_transform, const CameraMatrix &p_cam_projection, bool p_cam_ortogonal, const PagedArray<GeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, RID p_environment, RID p_camera_effects, RID p_shadow_atlas, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold,const RenderShadowData *p_render_shadows,int p_render_shadow_count,const RenderSDFGIData *p_render_sdfgi_regions,int p_render_sdfgi_region_count,const RenderSDFGIStaticLightData *p_render_sdfgi_static_lights=nullptr) = 0;
|
|
|
+ // virtual void render_scene(RID p_render_buffers, const Transform3D &p_cam_transform, const CameraMatrix &p_cam_projection, bool p_cam_orthogonal, const PagedArray<GeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, RID p_environment, RID p_camera_effects, RID p_shadow_atlas, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold,const RenderShadowData *p_render_shadows,int p_render_shadow_count,const RenderSDFGIData *p_render_sdfgi_regions,int p_render_sdfgi_region_count,const RenderSDFGIStaticLightData *p_render_sdfgi_static_lights=nullptr) = 0;
|
|
|
}
|
|
|
|
|
|
RID RendererSceneCull::_render_get_environment(RID p_camera, RID p_scenario) {
|
Clay John