Skip to content

Commit

Permalink
FIX: Some fixes on multiple bugs, removing hologram shifiting on zone…
Browse files Browse the repository at this point in the history 
…_a and capsule volumetric fix.
  • Loading branch information
@albertoamo
albertoamo committed Nov 2, 2018
1 parent ee6e0c3 commit 24078fe
Show file tree
Hide file tree
Showing 6 changed files with 126 additions and 167 deletions.
5 changes: 2 additions & 3 deletions Bin/data/resource_list/to_add/scene_basilic_courtyard.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,15 +597,14 @@ data/prefabs/casas_4_lp.prefab
data/meshes/mesh_casas_4_lp.mesh
data/scenes/Basilic_courtyard/bc_capsule_cable.scene
data/meshes/BC_Capsules_Cable.mesh
data/scenes/BC_Maderas_Andamios.scene
data/meshes/BC_madera_andamio.mesh
data/scenes/BC_Maderas_Andamios_2.scene
data/meshes/BC_madera006.mesh
data/textures/tx_tablas_subida_alb.dds
data/textures/tx_tablas_subida_ao.dds
data/textures/tx_tablas_subida_met.dds
data/textures/tx_tablas_subida_nml.dds
data/textures/tx_tablas_subida_rgh.dds
data/materials/mtl_texturas_subida.material
data/colliders/collider_BC_madera_andamio.collider
data/scenes/BC_ColliderAuxEntrances.scene
data/scenes/BC_estandarte.scene
data/meshes/mesh_estandarte003.mesh
Expand Down
5 changes: 5 additions & 0 deletions Bin/data/resource_list/to_add/scene_basilic_interior.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,11 @@ data/particles/def_amb_smoke_interior_fast.particles
data/scenes/Basilic_interior/basilic_interior_holograms.scene
data/meshes/BC_alminar_atlas_low001.mesh
data/materials/characters/mtl_player_main_hologram_solid.material
data/scenes/basilic_interior_pantallas_3.scene
data/meshes/im_monitor_pantalla_1.mesh
data/materials/mtl_monitores_interior.material
data/meshes/im_monitor_pantalla_2.mesh
data/meshes/im_monitor_pantalla_3.mesh
data/scenes/basilic_interior_luces.scene
data/colliders/luz_lateral.collider
data/colliders/luz_lateral001.collider
Expand Down
275 changes: 113 additions & 162 deletions Bin/data/scenes/zone_a_hologramas.scene
View file
Original file line number Diff line number Diff line change
@@ -1,163 +1,114 @@
[
{
"entity":
{
"name": "zone_a_hologramas"
,
"transform":
{
"pos": "0.0 0.0 0.0"
}
}
}
,
{
"entity":
{
"name": "mesh_chimenea_holograma001"
,
"transform":
{
"pos": "-52.4723 15.4283 -97.2506"
,
"rotation": "0.0 0.0 0.0 -1.0"
}
,
"render":
[
{
"mesh": "data/meshes/mesh_chimenea_holograma001.mesh"
,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
]
, "rotator": {},
"abs_aabb": true
,
"local_aabb": true
}
}
,
{
"entity":
{
"name": "mesh_chimenea_holograma002"
,
"transform":
{
"pos": "-57.8369 15.4283 -97.2506"
,
"rotation": "0.0 0.0 0.0 -1.0"
}
,
"render":
[
{
"mesh": "data/meshes/mesh_chimenea_holograma002.mesh"
,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
]
, "rotator": {},
"abs_aabb": true
,
"local_aabb": true
}
}
,
{
"entity":
{
"name": "mesh_chimenea_holograma003"
,
"transform":
{
"pos": "-113.96 15.4283 -116.008"
,
"rotation": "0.0 0.0 0.0 -1.0"
}
,
"render":
[
{
"mesh": "data/meshes/mesh_chimenea_holograma003.mesh"
,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
]
, "rotator": {},
"abs_aabb": true
,
"local_aabb": true
}
}
,
{
"entity":
{
"name": "mesh_chimenea_holograma004"
,
"transform":
{
"pos": "-73.5591 15.4283 -163.5"
,
"rotation": "0.0 0.0 0.0 -1.0"
}
,
"render":
[
{
"mesh": "data/meshes/mesh_chimenea_holograma004.mesh"
,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
]
, "rotator": {},
"abs_aabb": true
,
"local_aabb": true
}
}
,
{
"entity":
{
"name": "mesh_chimenea_holograma005"
,
"transform":
{
"pos": "-66.3945 15.4283 -163.472"
,
"rotation": "0.0 0.0 0.0 -1.0"
}
,
"render":
[
{
"mesh": "data/meshes/mesh_chimenea_holograma005.mesh"
,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
]
, "rotator": {},
"abs_aabb": true
,
"local_aabb": true
}
}
[{
"entity": {
"name": "zone_a_hologramas",
"transform": {
"pos": "0.0 0.0 0.0"
}
}
}, {
"entity": {
"name": "mesh_chimenea_holograma001",
"transform": {
"pos": "-52.4723 15.4283 -97.2506",
"rotation": "0.0 0.0 0.0 -1.0"
},
"render":
[{
"mesh": "data/meshes/mesh_chimenea_holograma001.mesh",
"self_intensity": 0,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
],
"rotator": {},
"abs_aabb": true,
"local_aabb": true
}
}, {
"entity": {
"name": "mesh_chimenea_holograma002",
"transform": {
"pos": "-57.8369 15.4283 -97.2506",
"rotation": "0.0 0.0 0.0 -1.0"
},
"render":
[{
"mesh": "data/meshes/mesh_chimenea_holograma002.mesh",
"self_intensity": 0,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
],
"rotator": {},
"abs_aabb": true,
"local_aabb": true
}
}, {
"entity": {
"name": "mesh_chimenea_holograma003",
"transform": {
"pos": "-113.96 15.4283 -116.008",
"rotation": "0.0 0.0 0.0 -1.0"
},
"render":
[{
"mesh": "data/meshes/mesh_chimenea_holograma003.mesh",
"self_intensity": 0,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
],
"rotator": {},
"abs_aabb": true,
"local_aabb": true
}
}, {
"entity": {
"name": "mesh_chimenea_holograma004",
"transform": {
"pos": "-73.5591 15.4283 -163.5",
"rotation": "0.0 0.0 0.0 -1.0"
},
"render":
[{
"mesh": "data/meshes/mesh_chimenea_holograma004.mesh",
"self_intensity": 0,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
],
"rotator": {},
"abs_aabb": true,
"local_aabb": true
}
}, {
"entity": {
"name": "mesh_chimenea_holograma005",
"transform": {
"pos": "-66.3945 15.4283 -163.472",
"rotation": "0.0 0.0 0.0 -1.0"
},
"render":
[{
"mesh": "data/meshes/mesh_chimenea_holograma005.mesh",
"self_intensity": 0,
"materials":
[
"data/materials/mtl_holograma_chimenea.material"
]
}
],
"rotator": {},
"abs_aabb": true,
"local_aabb": true
}
}
]
2 changes: 1 addition & 1 deletion Bin/data/shaders/hologram.fx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void VS_GBuffer_Hologram(
, out float3 oWorldPos : TEXCOORD2
)
{
iPos.x += 0.5 * (step(0.5, sin(global_world_time * 2.0 + iPos.y * 1.0)) * step(0.99, sin(global_world_time *4 * 0.5)));
iPos.x += 0.5 * (step(0.5, sin(global_world_time * 2.0 + iPos.y * 1.0)) * step(0.99, sin(global_world_time *4 * 0.5))) * self_intensity;

float4 world_pos = mul(iPos, obj_world);
oPos = mul(world_pos, camera_view_proj);
Expand Down
5 changes: 4 additions & 1 deletion source/components/object_controller/comp_capsule_final_effects.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ void TCompCapsuleFinalEffects::update(float dt) {
if (time_passed >= time_for_close_lights) {
firstLight.destroy();
secondLight.destroy();
volumeLight.destroy();
active = false;
}
time_passed += dt;
Expand All @@ -39,9 +40,11 @@ void TCompCapsuleFinalEffects::onMsgEntityCreated(const TMsgEntityCreated& msg)
CEntity* meshCapsula = group->handles[2];
CEntity* meshLight1 = group->handles[0];
CEntity* meshLight2 = group->handles[1];
CEntity* meshVolume = group->handles[3];
meshRenderHandle = meshCapsula->get<TCompRender>();
firstLight = meshLight1->get<TCompLightPoint>();
secondLight = meshLight2->get<TCompLightPoint>();;
secondLight = meshLight2->get<TCompLightPoint>();
volumeLight = meshVolume->get<TCompLightPoint>();;
}

void TCompCapsuleFinalEffects::onMsgEmisiveCapsuleState(const TMsgEmisiveCapsuleState& msg) {
Expand Down
1 change: 1 addition & 0 deletions source/components/object_controller/comp_capsule_final_effects.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class TCompCapsuleFinalEffects : public TCompBase
CHandle meshRenderHandle;
CHandle firstLight;
CHandle secondLight;
CHandle volumeLight;

bool active = false;
float time_passed = 0.0f;
Expand Down

0 comments on commit 24078fe

Please sign in to comment.