Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] 2nd iteration on improving office world #84

Draft
wants to merge 4 commits into
base: humble
Choose a base branch
from
Draft

[WIP] 2nd iteration on improving office world #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a04508
roof
larodriguez22 Sep 10, 2024
f949c52
small fix
larodriguez22 Sep 10, 2024
87dd367
making roof more accurate
larodriguez22 Sep 10, 2024
21b01be
adding door, light and windows
larodriguez22 Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added andino_gz/models/office/materials/textures/walls/logo.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 70 additions & 0 deletions andino_gz/models/office/meshes/door.dae
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<asset>
<contributor>
<author>Blender User</author>
<authoring_tool>Blender 4.2.3 LTS commit date:2024-10-14, commit time:15:20, hash:0e22e4fcea03</authoring_tool>
</contributor>
<created>2024-11-09T11:52:24</created>
<modified>2024-11-09T11:52:24</modified>
<unit name="meter" meter="1"/>
<up_axis>Z_UP</up_axis>
</asset>
<library_effects/>
<library_images/>
<library_geometries>
<geometry id="Room_001-mesh" name="Room.001">
<mesh>
<source id="Room_001-mesh-positions">
<float_array id="Room_001-mesh-positions-array" count="144">0.2721363 4.933472 0.9107832 0.9221364 4.933472 1.210783 1.572136 4.933472 1.510783 0.2721363 4.933472 0.01078313 0.9221364 4.933472 0.01078313 1.572136 4.933472 0.01078313 0.3096364 4.783472 0.9107832 0.9221366 4.783472 1.210783 1.534637 4.783472 1.510783 0.3096364 4.783472 0.01078313 0.9221366 4.783472 0.01078313 1.534637 4.783472 0.01078313 1.534637 4.783472 1.210783 0.9221366 4.783472 0.9107832 1.534637 4.783472 0.9107832 0.3096364 4.783472 0.6107832 0.9221366 4.783472 0.6107832 1.534637 4.783472 0.6107832 0.3096364 4.783472 0.3107832 0.9221366 4.783472 0.3107832 1.534637 4.783472 0.3107832 0.2721363 4.933472 0.6107832 0.2721363 4.933472 0.3107832 0.9221364 4.933472 0.9107832 0.9221364 4.933472 0.6107832 0.9221364 4.933472 0.3107832 1.572136 4.933472 1.210783 1.572136 4.933472 0.9107832 1.572136 4.933472 0.6107832 1.572136 4.933472 0.3107832 0.3096364 4.783472 2.110783 0.3096365 4.783472 1.810783 0.9221366 4.783472 2.110783 0.3096365 4.783472 1.510783 0.9221367 4.783472 1.810783 1.534637 4.783472 2.110783 0.3096364 4.783472 1.210783 0.9221366 4.783472 1.510783 1.534637 4.783472 1.810783 0.2721363 4.933472 2.110783 0.9221364 4.933472 2.110783 0.2721363 4.933472 1.810783 1.572137 4.933472 2.110783 0.9221366 4.933472 1.810783 0.2721365 4.933472 1.510783 1.572137 4.933472 1.810783 0.9221366 4.933472 1.510783 0.2721365 4.933472 1.210783</float_array>
<technique_common>
<accessor source="#Room_001-mesh-positions-array" count="48" stride="3">
<param name="X" type="float"/>
<param name="Y" type="float"/>
<param name="Z" type="float"/>
</accessor>
</technique_common>
</source>
<source id="Room_001-mesh-normals">
<float_array id="Room_001-mesh-normals-array" count="27">0 -1 0 0 1 0 0 -1 5.08284e-7 0 -1 -1.01657e-6 0 1 -1.304e-6 0 1 2.44532e-6 0 1 -1.304e-6 0 1 -1.14132e-6 0 1 -1.14132e-6</float_array>
<technique_common>
<accessor source="#Room_001-mesh-normals-array" count="9" stride="3">
<param name="X" type="float"/>
<param name="Y" type="float"/>
<param name="Z" type="float"/>
</accessor>
</technique_common>
</source>
<source id="Room_001-mesh-map">
<float_array id="Room_001-mesh-map-array" count="336">-48.80488 18.94348 -48.80488 18.26074 -49.11999 18.26074 -48.48978 19.62623 -48.48978 18.94348 -48.80488 18.94348 -48.80488 18.94348 -48.48978 18.94348 -48.80488 18.26074 -48.48978 18.94348 -48.48978 18.26074 -48.80488 18.26074 -48.48978 19.62623 -48.17467 19.62623 -48.48978 18.94348 -48.17467 19.62623 -48.17467 18.94348 -48.48978 18.94348 -48.48978 18.94348 -48.17467 18.94348 -48.48978 18.26074 -48.17467 18.94348 -48.17467 18.26074 -48.48978 18.26074 -48.17467 19.62623 -47.85956 19.62623 -48.17467 18.94348 -47.85956 19.62623 -47.85956 18.94348 -48.17467 18.94348 -48.17467 18.94348 -47.85956 18.94348 -48.17467 18.26074 -47.85956 18.94348 -47.85956 18.26074 -48.17467 18.26074 -47.85956 19.62623 -47.54446 19.62623 -47.85956 18.94348 -47.54446 19.62623 -47.54446 18.94348 -47.85956 18.94348 -47.85956 18.94348 -47.54446 18.94348 -47.85956 18.26074 -47.54446 18.94348 -47.54446 18.26074 -47.85956 18.26074 -48.80488 18.94348 -48.48978 18.94348 -48.48978 19.62623 -49.11999 18.26074 -48.80488 18.26074 -48.80488 18.94348 -48.48978 19.62623 -48.48978 18.94348 -48.17467 19.62623 -48.48978 18.94348 -48.17467 18.94348 -48.17467 19.62623 -48.17467 19.62623 -48.17467 18.94348 -47.85956 19.62623 -48.17467 18.94348 -47.85956 18.94348 -47.85956 19.62623 -47.85956 19.62623 -47.85956 18.94348 -47.54446 19.62623 -47.85956 18.94348 -47.54446 18.94348 -47.54446 19.62623 -48.80488 18.94348 -48.80488 18.26074 -48.48978 18.94348 -48.80488 18.26074 -48.48978 18.26074 -48.48978 18.94348 -48.48978 18.94348 -48.48978 18.26074 -48.17467 18.94348 -48.48978 18.26074 -48.17467 18.26074 -48.17467 18.94348 -48.17467 18.94348 -48.17467 18.26074 -47.85956 18.94348 -48.17467 18.26074 -47.85956 18.26074 -47.85956 18.94348 -47.85956 18.94348 -47.85956 18.26074 -47.54446 18.94348 -47.85956 18.26074 -47.54446 18.26074 -47.54446 18.94348 -49.43509 19.62623 -49.7502 18.94349 -49.7502 19.62623 -49.11999 19.62623 -49.43509 18.94349 -49.43509 19.62623 -49.43509 19.62623 -49.43509 18.94349 -49.7502 18.94349 -49.43509 18.94349 -49.7502 18.26074 -49.7502 18.94349 -48.80488 19.62623 -49.11999 18.94349 -49.11999 19.62623 -49.11999 19.62623 -49.11999 18.94349 -49.43509 18.94349 -49.11999 18.94349 -49.43509 18.26074 -49.43509 18.94349 -49.43509 18.94349 -49.43509 18.26074 -49.7502 18.26074 -48.48978 19.62623 -48.80488 18.94348 -48.80488 19.62623 -48.80488 19.62623 -48.80488 18.94348 -49.11999 18.94349 -48.80488 18.94348 -49.11999 18.26074 -49.11999 18.94349 -49.11999 18.94349 -49.11999 18.26074 -49.43509 18.26074 -49.7502 18.94349 -49.4351 19.62623 -49.7502 19.62623 -49.7502 18.26074 -49.43509 18.94349 -49.7502 18.94349 -49.7502 18.94349 -49.43509 18.94349 -49.4351 19.62623 -49.43509 18.94349 -49.11999 19.62623 -49.4351 19.62623 -49.7502 18.26074 -49.43509 18.26074 -49.43509 18.94349 -49.43509 18.26074 -49.11999 18.94349 -49.43509 18.94349 -49.43509 18.94349 -49.11999 18.94349 -49.11999 19.62623 -49.11999 18.94349 -48.80488 19.62623 -49.11999 19.62623 -49.43509 18.26074 -49.11999 18.26074 -49.11999 18.94349 -49.11999 18.26074 -48.80488 18.94348 -49.11999 18.94349 -49.11999 18.94349 -48.80488 18.94348 -48.80488 19.62623 -48.80488 18.94348 -48.48978 19.62623 -48.80488 19.62623</float_array>
<technique_common>
<accessor source="#Room_001-mesh-map-array" count="168" stride="2">
<param name="S" type="float"/>
<param name="T" type="float"/>
</accessor>
</technique_common>
</source>
<vertices id="Room_001-mesh-vertices">
<input semantic="POSITION" source="#Room_001-mesh-positions"/>
</vertices>
<triangles count="56">
<input semantic="VERTEX" source="#Room_001-mesh-vertices" offset="0"/>
<input semantic="NORMAL" source="#Room_001-mesh-normals" offset="1"/>
<input semantic="TEXCOORD" source="#Room_001-mesh-map" offset="2" set="0"/>
<p>7 0 0 12 0 1 8 0 2 6 0 3 13 0 4 7 0 5 7 0 6 13 0 7 12 0 8 13 0 9 14 0 10 12 0 11 6 0 12 15 0 13 13 0 14 15 0 15 16 0 16 13 0 17 13 0 18 16 0 19 14 0 20 16 0 21 17 0 22 14 0 23 15 0 24 18 0 25 16 0 26 18 0 27 19 0 28 16 0 29 16 0 30 19 0 31 17 0 32 19 0 33 20 0 34 17 0 35 18 0 36 9 0 37 19 0 38 9 0 39 10 0 40 19 0 41 19 0 42 10 0 43 20 0 44 10 0 45 11 0 46 20 0 47 1 1 48 23 1 49 0 1 50 2 1 51 26 1 52 1 1 53 0 1 54 23 1 55 21 1 56 23 1 57 24 1 58 21 1 59 21 1 60 24 1 61 22 1 62 24 1 63 25 1 64 22 1 65 22 1 66 25 1 67 3 1 68 25 1 69 4 1 70 3 1 71 1 1 72 26 1 73 23 1 74 26 1 75 27 1 76 23 1 77 23 1 78 27 1 79 24 1 80 27 1 81 28 1 82 24 1 83 24 1 84 28 1 85 25 1 86 28 1 87 29 1 88 25 1 89 25 1 90 29 1 91 4 1 92 29 1 93 5 1 94 4 1 95 31 0 96 32 0 97 30 0 98 33 0 99 34 0 100 31 0 101 31 2 102 34 2 103 32 2 104 34 0 105 35 0 106 32 0 107 36 0 108 37 0 109 33 0 110 33 3 111 37 3 112 34 3 113 37 0 114 38 0 115 34 0 116 34 0 117 38 0 118 35 0 119 6 0 120 7 0 121 36 0 122 36 0 123 7 0 124 37 0 125 7 0 126 8 0 127 37 0 128 37 0 129 8 0 130 38 0 131 40 1 132 41 1 133 39 1 134 42 4 135 43 4 136 40 4 137 40 5 138 43 5 139 41 5 140 43 6 141 44 6 142 41 6 143 42 1 144 45 1 145 43 1 146 45 1 147 46 1 148 43 1 149 43 1 150 46 1 151 44 1 152 46 1 153 47 1 154 44 1 155 45 1 156 2 1 157 46 1 158 2 7 159 1 7 160 46 7 161 46 1 162 1 1 163 47 1 164 1 8 165 0 8 166 47 8 167</p>
</triangles>
</mesh>
</geometry>
</library_geometries>
<library_visual_scenes>
<visual_scene id="Scene" name="Scene">
<node id="Door" name="Door" type="NODE">
<matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
<instance_geometry url="#Room_001-mesh" name="Door"/>
</node>
</visual_scene>
</library_visual_scenes>
<scene>
<instance_visual_scene url="#Scene"/>
</scene>
</COLLADA>
115 changes: 115 additions & 0 deletions andino_gz/models/office/meshes/logo.dae
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8"?>
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<asset>
<contributor>
<author>Blender User</author>
<authoring_tool>Blender 4.2.3 LTS commit date:2024-10-14, commit time:15:20, hash:0e22e4fcea03</authoring_tool>
</contributor>
<created>2024-11-09T15:18:50</created>
<modified>2024-11-09T15:18:50</modified>
<unit name="meter" meter="1"/>
<up_axis>Z_UP</up_axis>
</asset>
<library_effects>
<effect id="Empty-effect">
<profile_COMMON>
<newparam sid="logo_jpeg-surface">
<surface type="2D">
<init_from>logo_jpeg</init_from>
</surface>
</newparam>
<newparam sid="logo_jpeg-sampler">
<sampler2D>
<source>logo_jpeg-surface</source>
</sampler2D>
</newparam>
<technique sid="common">
<lambert>
<emission>
<color sid="emission">0 0 0 1</color>
</emission>
<diffuse>
<texture texture="logo_jpeg-sampler" texcoord="UVMap"/>
</diffuse>
<index_of_refraction>
<float sid="ior">1.5</float>
</index_of_refraction>
</lambert>
</technique>
</profile_COMMON>
</effect>
</library_effects>
<library_images>
<image id="logo_jpeg" name="logo_jpeg">
<init_from>../materials/textures/walls/logo.jpeg</init_from>
</image>
</library_images>
<library_materials>
<material id="Empty-material" name="Empty">
<instance_effect url="#Empty-effect"/>
</material>
</library_materials>
<library_geometries>
<geometry id="Empty-mesh" name="Empty">
<mesh>
<source id="Empty-mesh-positions">
<float_array id="Empty-mesh-positions-array" count="12">-1.019043 -0.5656902 0 1.104844 -0.5656902 0 -1.019043 0.6236866 0 1.104844 0.6236866 0</float_array>
<technique_common>
<accessor source="#Empty-mesh-positions-array" count="4" stride="3">
<param name="X" type="float"/>
<param name="Y" type="float"/>
<param name="Z" type="float"/>
</accessor>
</technique_common>
</source>
<source id="Empty-mesh-normals">
<float_array id="Empty-mesh-normals-array" count="6">0 0 1 0 0 1</float_array>
<technique_common>
<accessor source="#Empty-mesh-normals-array" count="2" stride="3">
<param name="X" type="float"/>
<param name="Y" type="float"/>
<param name="Z" type="float"/>
</accessor>
</technique_common>
</source>
<source id="Empty-mesh-map-0">
<float_array id="Empty-mesh-map-0-array" count="12">1 0 0 1 0 0 1 0 1 1 0 1</float_array>
<technique_common>
<accessor source="#Empty-mesh-map-0-array" count="6" stride="2">
<param name="S" type="float"/>
<param name="T" type="float"/>
</accessor>
</technique_common>
</source>
<vertices id="Empty-mesh-vertices">
<input semantic="POSITION" source="#Empty-mesh-positions"/>
</vertices>
<triangles material="Empty-material" count="2">
<input semantic="VERTEX" source="#Empty-mesh-vertices" offset="0"/>
<input semantic="NORMAL" source="#Empty-mesh-normals" offset="1"/>
<input semantic="TEXCOORD" source="#Empty-mesh-map-0" offset="2" set="0"/>
<p>1 0 0 2 0 1 0 0 2 1 1 3 3 1 4 2 1 5</p>
</triangles>
</mesh>
</geometry>
</library_geometries>
<library_visual_scenes>
<visual_scene id="Scene" name="Scene">
<node id="Empty_001" name="Empty.001" type="NODE">
<matrix sid="transform">7.54979e-8 -7.54979e-8 1 -1.8 1 5.69993e-15 -7.54979e-8 0.6 0 1 7.54979e-8 1.5 0 0 0 1</matrix>
<instance_geometry url="#Empty-mesh" name="Empty.001">
<bind_material>
<technique_common>
<instance_material symbol="Empty-material" target="#Empty-material">
<bind_vertex_input semantic="UVMap" input_semantic="TEXCOORD" input_set="0"/>
</instance_material>
</technique_common>
</bind_material>
</instance_geometry>
</node>
</visual_scene>
</library_visual_scenes>
<scene>
<instance_visual_scene url="#Scene"/>
</scene>
</COLLADA>
76 changes: 76 additions & 0 deletions andino_gz/models/office/meshes/roof.dae
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 12 additions & 18 deletions andino_gz/models/office/meshes/walls.dae
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 70 additions & 0 deletions andino_gz/models/office/meshes/window1.dae
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 70 additions & 0 deletions andino_gz/models/office/meshes/window2.dae
View file
Open in desktop

Large diffs are not rendered by default.

97 changes: 96 additions & 1 deletion andino_gz/models/office/model.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,80 @@
</material>
</visual>
</link>
<link name='door'>
<visual name='visual'>
<geometry>
<mesh>
<scale>1 1 1</scale>
<uri>meshes/door.dae</uri>
</mesh>
</geometry>
<material>
<diffuse>1 1 1 1</diffuse>
<specular>1 1 1 1</specular>
<pbr>
<metal>
<albedo_map>materials/textures/wood/wood_floor_diff_4k.jpg</albedo_map>
<normal_map>materials/textures/wood/wood_floor_nor_gl_4k.exr</normal_map>
<roughness_map>materials/textures/wood/wood_floor_rough_4k.exr</roughness_map>
<metalness>0.</metalness>
</metal>
</pbr>
</material>
</visual>
</link>
<link name='windows1'>
<visual name='visual'>
<geometry>
<mesh>
<scale>1 1 1</scale>
<uri>meshes/window1.dae</uri>
</mesh>
</geometry>
<!-- Idea of transparency taken from https://github.com/gazebosim/gz-rendering/issues/846#issuecomment-1549579115 -->
<material>
<ambient>0.3 0.3 0.3 0.8</ambient>
<diffuse>0.7 0.7 0.7 0.8</diffuse>
<specular>1 1 1 0.8</specular>
</material>
</visual>
</link>
<link name='windows2'>
<visual name='visual'>
<geometry>
<mesh>
<scale>1 1 1</scale>
<uri>meshes/window2.dae</uri>
</mesh>
</geometry>
<!-- Idea of transparency taken from https://github.com/gazebosim/gz-rendering/issues/846#issuecomment-1549579115 -->
<material>
<ambient>0.3 0.3 0.3 0.8</ambient>
<diffuse>0.7 0.7 0.7 0.8</diffuse>
<specular>1 1 1 0.8</specular>
</material>
</visual>
</link>
<link name='logo'>
<visual name='visual'>
<geometry>
<mesh>
<scale>1 1 1</scale>
<uri>meshes/logo.dae</uri>
</mesh>
</geometry>
<material>
<diffuse>1 1 1 1</diffuse>
<specular>1 1 1 1</specular>
<pbr>
<metal>
<albedo_map>materials/textures/walls/logo.jpeg</albedo_map>
<metalness>0.</metalness>
</metal>
</pbr>
</material>
</visual>
</link>
<link name='tiles'>
<visual name='visual'>
<geometry>
Expand All @@ -83,7 +157,28 @@
</material>
</visual>
</link>

<link name='roof'>
<visual name='visual'>
<geometry>
<mesh>
<scale>1 1 1</scale>
<uri>meshes/roof.dae</uri>
</mesh>
</geometry>
<material>
<diffuse>1 1 1 1</diffuse>
<specular>0 0 0 0</specular>
<pbr>
<metal>
<albedo_map>materials/textures/walls/macro_flour_diff_4k.jpg</albedo_map>
<normal_map>materials/textures/walls/macro_flour_nor_gl_4k.exr</normal_map>
<roughness_map>materials/textures/walls/macro_flour_rough_4k.exr</roughness_map>
<metalness>0.</metalness>
</metal>
</pbr>
</material>
</visual>
</link>
<pose>0 0 0 0 0 0</pose>
</model>
</sdf>
19 changes: 19 additions & 0 deletions andino_gz/worlds/office.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,24 @@
model://office
</uri>
</include>
<light name='directionallight' type='directional'>
<pose>0.497139 -0.384173 2 0 -0 0</pose>
<cast_shadows>false</cast_shadows>
<intensity>0.7</intensity>
<direction>0 0 -1</direction>
<diffuse>0.8 0.8 0.8 1</diffuse>
<specular>0.2 0.2 0.2 1</specular>
<attenuation>
<range>1000</range>
<linear>0.01</linear>
<constant>0.90000000000000002</constant>
<quadratic>0.001</quadratic>
</attenuation>
<spot>
<inner_angle>0</inner_angle>
<outer_angle>0</outer_angle>
<falloff>0</falloff>
</spot>
</light>
</world>
</sdf>
19 changes: 19 additions & 0 deletions andino_gz/worlds/populated_office.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,5 +488,24 @@
<falloff>0</falloff>
</spot>
</light>
<light name='directionallight' type='directional'>
<pose>0.497139 -0.384173 2 0 -0 0</pose>
<cast_shadows>false</cast_shadows>
<intensity>0.7</intensity>
<direction>0 0 -1</direction>
<diffuse>0.8 0.8 0.8 1</diffuse>
<specular>0.2 0.2 0.2 1</specular>
<attenuation>
<range>1000</range>
<linear>0.01</linear>
<constant>0.90000000000000002</constant>
<quadratic>0.001</quadratic>
</attenuation>
<spot>
<inner_angle>0</inner_angle>
<outer_angle>0</outer_angle>
<falloff>0</falloff>
</spot>
</light>
</world>
</sdf>
Loading