From e1d3a6344dfd85c94fcb8183c4e56779b4fc95e9 Mon Sep 17 00:00:00 2001 From: Alcolado Nuthall <gn00217@cvplws235.eps.surrey.ac.uk> Date: Thu, 27 Jul 2023 11:40:47 +0100 Subject: [PATCH] tidy: consistent node naming --- generated_materials/camera_path_depth.json | 24 +++++++++--------- generated_materials/camera_path_rgb.json | 24 +++++++++--------- {nerf_sim => helper_nodes}/pose_generator.py | 0 .../basic_sim_example_launch.cpython-310.pyc | Bin 802 -> 806 bytes launch/basic_sim_example_launch.py | 4 +-- .../__pycache__/nerf_render.cpython-310.pyc | Bin 4156 -> 4156 bytes .../__pycache__/render_lidar.cpython-310.pyc | Bin 3303 -> 3386 bytes .../sim_depth_generator.cpython-310.pyc | Bin 2870 -> 2862 bytes .../sim_pcd_generator.cpython-310.pyc | Bin 0 -> 2870 bytes .../sim_rgb_generator.cpython-310.pyc | Bin 2860 -> 2844 bytes ...publisher_node.py => sim_pcd_generator.py} | 4 +-- setup.py | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) rename {nerf_sim => helper_nodes}/pose_generator.py (100%) create mode 100644 nerf_sim/__pycache__/sim_pcd_generator.cpython-310.pyc rename nerf_sim/{pcd_publisher_node.py => sim_pcd_generator.py} (98%) diff --git a/generated_materials/camera_path_depth.json b/generated_materials/camera_path_depth.json index 278acc2..0b1a73e 100644 --- a/generated_materials/camera_path_depth.json +++ b/generated_materials/camera_path_depth.json @@ -8,22 +8,22 @@ "aspect": 1.33333333333, "camera_to_world": [ [ - -0.5864376195618306, - 0.29104753718687776, - -0.7558983062953022, - -0.2832813335422174 + -0.848238288049699, + 0.21349126112248315, + -0.48467854100511626, + -0.14224136496708473 ], [ - -0.8096524572344355, - -0.18351676230420205, - 0.5574804897461648, - -0.16196170949416663 + -0.5266080387192569, + -0.24261177561480995, + 0.8147536436796631, + 0.05666580051652575 ], [ - 0.023533313767811814, - 0.9389424524702438, - 0.3432684868907569, - -0.09978051483234415 + 0.05635406145766281, + 0.9463408517851067, + 0.3182188115116156, + -0.10524663656992898 ], [ 0.0, diff --git a/generated_materials/camera_path_rgb.json b/generated_materials/camera_path_rgb.json index 278acc2..0b1a73e 100644 --- a/generated_materials/camera_path_rgb.json +++ b/generated_materials/camera_path_rgb.json @@ -8,22 +8,22 @@ "aspect": 1.33333333333, "camera_to_world": [ [ - -0.5864376195618306, - 0.29104753718687776, - -0.7558983062953022, - -0.2832813335422174 + -0.848238288049699, + 0.21349126112248315, + -0.48467854100511626, + -0.14224136496708473 ], [ - -0.8096524572344355, - -0.18351676230420205, - 0.5574804897461648, - -0.16196170949416663 + -0.5266080387192569, + -0.24261177561480995, + 0.8147536436796631, + 0.05666580051652575 ], [ - 0.023533313767811814, - 0.9389424524702438, - 0.3432684868907569, - -0.09978051483234415 + 0.05635406145766281, + 0.9463408517851067, + 0.3182188115116156, + -0.10524663656992898 ], [ 0.0, diff --git a/nerf_sim/pose_generator.py b/helper_nodes/pose_generator.py similarity index 100% rename from nerf_sim/pose_generator.py rename to helper_nodes/pose_generator.py diff --git a/launch/__pycache__/basic_sim_example_launch.cpython-310.pyc b/launch/__pycache__/basic_sim_example_launch.cpython-310.pyc index cd736e8dc02aa4cc87b2f6e2e7d69a4ccc1d9257..8335d3fe421797ebae043721606ec3982b4849cb 100644 GIT binary patch delta 33 ncmZ3)wv3H8pO=@50SMGQ52f7N$lJ@vDp;JE8^3urV>=@NjMNE5 delta 29 jcmZ3+wup^4pO=@50SJ2U9Z0#fk++wTk$3Za#&$*kcgF~e diff --git a/launch/basic_sim_example_launch.py b/launch/basic_sim_example_launch.py index 21733ff..7a93728 100644 --- a/launch/basic_sim_example_launch.py +++ b/launch/basic_sim_example_launch.py @@ -24,8 +24,8 @@ def generate_launch_description(): ), Node( package='nerf_sim', - executable='pcd_generator', - name='pcd_generator' + executable='sim_pcd_generator', + name='sim_pcd_generator' ), Node( package='rviz2', diff --git a/nerf_sim/__pycache__/nerf_render.cpython-310.pyc b/nerf_sim/__pycache__/nerf_render.cpython-310.pyc index 7b6193e84355ea083960aac2af291f6d80411378..2b984416956732828759a50a5db71aba45abbe89 100644 GIT binary patch delta 59 zcmdm^ut$L}pO=@50SH1|52Z{I+Q=8e!6>mgnd31NW9(*kZgwWd)Xo09oQ#Y?n<M$A OF)}hu{=o0eXaxYo3J(AP delta 59 zcmdm^ut$L}pO=@50SIDm97ypN*~k~d!6>;ond31NW9nviZgwWd+|B;HoQ#Z7n<M$A OF)}hw{=o0e=m-GSs1I}i diff --git a/nerf_sim/__pycache__/render_lidar.cpython-310.pyc b/nerf_sim/__pycache__/render_lidar.cpython-310.pyc index 4b60e6de2f8acc2f8db6c5157b35032574502dfa..cb147324dd8855f87567e37bc935842ba56279f5 100644 GIT binary patch delta 1308 zcmZux&u`pB6rS<#UkM@Ekfdz8+m@tRN<*kXq-qps2r2}mqLy-~K$hci7l)0#9ebrF zvXw(4aY85>aks?@{sayjN|8X^LGp<cm3k-#IC9`UCrztpM|$6U^WO8DneWZ+!<ipW zjK(7)7J+g9-TUl$XMeOw|JpzQN8>7CHgom}bM8sEW*NOfIwN9^KHfh$LRZ8$+QOvH zj6HJ8WG1s<w(1mH{G$Cwr^V0uJm6z}TKSIfmROZnEyH!gC`?^<O0<phyE5*1I5e0Q zuy??c4S-BybcW<|MmGr<g|#$88f1#(N-Ay2g;J7S1*R5SrWATf3Ioh6Nl7!+wGJb4 zVT1R0)XCHvM0~A&`H{v?!e*7ly=`}65V2lR>G2@#57MMkcy}Y=3mBLCKI1K52hc{} zL^p^6?xlg-kHaYSd+~s^gr_xjcUsqjhz0z^aP7+Vg&}D^g#u3oN{?1w{d*vcek$cO zhYQ2?rHoFKOnwor&19zRk(3lP135CKl-I~TnyXBG;%6FzmfSuJXkC))nYu<kJC_@o z2J@NR%=AJ^<xM3;-HejLtY>CP8{`>}cI449rz>NJzmiHy$(>j3%%^f;WV-lG`dC3d zL|blNJ|>Q}+zXS`kGJ|ODBwR5zzbyO;xJ*vxAM}3HzDCb+$Cg}kCt`eHZE5HUPbbj zFqHM?C7_k;$4Mn8VN|I}>iJ)Eth%8hRBoO<cBJv6MzD|vej3J6NBpV0+}=4g>{RYi zmRL7VO#BYJq4bQF(3*@CQYi*TVgfTWE3-@Sw{gwBg2!7$cw4-0E{$D9ijCzr5#AH~ z=JW?mpq086v!KV{K(6=$=2dpE)lauw-}65Y_#FCa%Fp3v^SH2Y^LWec1zpeIuGIR; z@kQ~kd3yH(hRuGQgm|Z<GkWl*wU~!p6b7p=^4YrL-HLAWmyjwR54_6ihj)XXi=2M~ zZvGm=MTFPutaQlBm-!%ChG=pMz*?k+G)gVWp<}f*03FGa#%Pm{)1Bv@6&F72*y4dT z3x5rdtk$*DxDje_pihMCY1^K*ehLDUV2J}@kuhpe!!Rsof@7pJ$7`W4iFKPz*3uas p@Af^O1RT}jYvL#S*LlnxR=zTpp&Nr<u!6tK<c#>yIV+9J{{tNuJ@Wtn delta 1205 zcmZuv&2QX96rUM?+nXh6w@r4p^dsM!l&H{4L_ZKEGzI!0wd4{}S+2+3INjLJcp_0` ztB2%LAr8?TkPrv^SojY(aY91k#3hoi9D3t|#HB^zjk_ULg{AlNo8NEVdo%CNPo3xO zW;`-tBly|}Khxiw{pKnB_x|F+G<9fW53SG85!!_R>?)#f(a}9bM|a8k9L4ugZ%mxT ze?GAwRwnoeEd2q1;x9;!a!g51GMu3al#wpV6{=8m4{=lg2fR`$D`*$zD%B2os#AlS zLtg8nT+h@Mbbl^4G7bKdxtZw&;mW4UwL;H~5_4_2Ffy~mEp$YIbjTQTQ(vJLwZ9=H z#%TNe_B>Y#NF?s-pHDqQ&q$?id3>WXm`6h|N`W9t7b+aGHe80a#kb0}Gxp^{m~ubf zO0G)wF9L89eKpe$qJVi^G>qkUChF}HIuhRgZ&~L#E0^a0YH?C*8=sDMVOc4DoK{L2 zMwOOw&wtdj#DTFk`Kq`KIxBaL4J)}cWP#7aIBJPI=E4)U45}}WbNFfCs9^Ox9)Oc! zirWZgfi@8shBaxU78-|{aI&csYKd|cJlRvFFiKRIU{;AroT;uoR7l|f`-ZBzjZ76^ zt52~eI@+llA49!LNqjnN9xPv-|M>9yft$o(#Qj0ML+3zE8vrJ5VViXDX{-`<69|8Q ztc{n%F|wq|hh~U1@)F+`ca`~zw?VGVBus)q7zI6;UK$J@R@i;BqUpL}6mr+SDE?3u z7hZ2sQ`Q8lTl70P@=;P;;+$}@D}FIkgIk%MIlJPTb;p^89c)Izl=$9SUSE*ztOVJ7 zwg>>T+whX0(piuM9%n5n+^vPJm<EITR+Z}SP_J@=t%N^zeb3(r*cG`4b9Pk*d?1$W z3A`#+?Q`#~NWn_tG?c?mdrfvvGJ4FyzI-b()dhCB4*#;kkJ%;ho!z~DL+1HJ!e>%a z`Txv9VLQ?Lpr)q*Y^;-}Vv`0Qt*r%Uix+kmTVmXqfv#V1&V0BgGe#1Q-sRD=z6HX& zV5w}XjYhGF8wQhXZ=TiN>WUv7dZNCp>9Ky|u{2=vifm3yH-7EZjg*tGqh2o}{%MTk PS#e@yN;ipl{FwbO8h#Iz diff --git a/nerf_sim/__pycache__/sim_depth_generator.cpython-310.pyc b/nerf_sim/__pycache__/sim_depth_generator.cpython-310.pyc index 2bf63e627516f78f0525992fe760c9869edf6d43..7c3f5aff2f4a7917332ad68f40691453724d9b66 100644 GIT binary patch delta 101 zcmdlcwoZ&UpO=@50SNNl4yE{S<c((J<8w(ZD9Lb7%}XsxEXm(o!N|?TCypvMnOUBN VPXR@2@ga6bK3No@&6hY*m;ek%AiMwo delta 109 zcmZ1{woQyTpO=@50SI_+97qY?$Q#WlAmE#smzkTG6HuCzlUbaRy19&zn@K<tU9_KB Xo<%?jO?2@dc18htG{McMI8vAZOU)!s diff --git a/nerf_sim/__pycache__/sim_pcd_generator.cpython-310.pyc b/nerf_sim/__pycache__/sim_pcd_generator.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a0b6f7418e72c0ea3a8bb7c1b348f4572bb0d868 GIT binary patch literal 2870 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 W4*;cCf4~9?5Z?>8f+(c!5B~+R?D%E? literal 0 HcmV?d00001 diff --git a/nerf_sim/__pycache__/sim_rgb_generator.cpython-310.pyc b/nerf_sim/__pycache__/sim_rgb_generator.cpython-310.pyc index c6dc5064dc764c4c96e1a82dd5af22683aa27947..7d7cf05c0c7ab5b16e312d96fd25526bbefce58b 100644 GIT binary patch delta 93 zcmZ1@Hb;y%pO=@50SKnM9ZE6X$Q#Yb!xQB0<er+BT9jClzqx{um5E0bS)`X)nuSLW TNo4U3c19j)B!SH*I8vAZ$R!*S delta 109 zcmbOuwnmIMpO=@50SG=`KagU(kvE!AK)^RMFEckWC!jPbC$l&sb#n<LE0cgEx@ar2 YG>d=|n&{#+?2H2PXo8z}aHKE+0EVz6#{d8T diff --git a/nerf_sim/pcd_publisher_node.py b/nerf_sim/sim_pcd_generator.py similarity index 98% rename from nerf_sim/pcd_publisher_node.py rename to nerf_sim/sim_pcd_generator.py index 4b102b5..031e155 100644 --- a/nerf_sim/pcd_publisher_node.py +++ b/nerf_sim/sim_pcd_generator.py @@ -12,7 +12,7 @@ from geometry_msgs.msg import Pose import numpy as np import open3d as o3d -class PCDPublisher(Node): +class PCDGenerator(Node): def __init__(self): super().__init__('pcd_publisher_node') @@ -85,7 +85,7 @@ def point_cloud(points, parent_frame): def main(args=None): # Boilerplate code. rclpy.init(args=args) - pcd_publisher = PCDPublisher() + pcd_publisher = PCDGenerator() rclpy.spin(pcd_publisher) # Destroy the node explicitly diff --git a/setup.py b/setup.py index 39277af..3925c61 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ setup( 'pose_generator = nerf_sim.pose_generator:main', 'sim_rgb_generator = nerf_sim.sim_rgb_generator:main', 'sim_depth_generator = nerf_sim.sim_depth_generator:main', - 'pcd_generator = nerf_sim.pcd_publisher_node:main', + 'sim_pcd_generator = nerf_sim.sim_pcd_generator:main', ], }, ) -- GitLab