From 9b6c72e92a6f0f473c59f731d6e051c5c72b64e5 Mon Sep 17 00:00:00 2001 From: Timon Roemer <t.roemer@vis.rwth-aachen.de> Date: Tue, 9 Apr 2024 14:16:09 +0200 Subject: [PATCH] Removes reference initialization in constrctor of IntenSelect Component --- .../IntenSelect/IntenSelectComponent.uasset | Bin 13746 -> 16974 bytes Content/Pawn/BP_RWTHVRPawn_Default.uasset | Bin 55485 -> 54618 bytes .../IntenSelect/IntenSelectable.cpp | 2 - .../IntenSelectableMultiPointScoring.cpp | 4 -- .../Private/Pawn/IntenSelectComponent.cpp | 44 ------------------ .../Public/Pawn/IntenSelectComponent.h | 26 +++++++---- 6 files changed, 16 insertions(+), 60 deletions(-) diff --git a/Content/IntenSelect/IntenSelectComponent.uasset b/Content/IntenSelect/IntenSelectComponent.uasset index bcbca98fc2ae30365a94ebddefbcd2c0b4019034..cfe13cafdbd408c2a7f1fc8d5cce5d7e3cbfbb7e 100644 GIT binary patch delta 5370 zcmdm#eXfOZ!Ve}zqsi7xW|IvVS@^0M7#M7s7#J8C7#Pm+O%69z4`pCrV0g>Nz`()4 zz;IWDfk6$*zbg(=CMv<eAS=PZU@5`C;Lq7=%)dk0cin`wJEk)IUCk3GbZ5;6Yu^=3 zUhiA@gaSaug3PI&ypJ(hX|V(YgOn4<d<6dg|NnnQBL)Uv1_lN>r_IJpn;0EHI-K)! zb5rw57*0v<nJ>h^z~GXaRGRLbpO@;JSdv<lnV7>+rGMudABs$BaR$Sk1D3IqpEBEv z@PMQ;iwklREBz94QyHqJK6Bcv!otoNCd|OV;Fe!ho>-I;lvoKjudn!lH$SQr$UwWd z8zN;;ghPrF^NI@+i&FEFE1gS=%2FBHw;m9htj+2x%+0{S;F(uYTH>6OnVik=!Dr(6 z$@c{$Cr@NGQIKF@V1QW`kXV$M>ztpHlbT$TnV-kd`272f$wyfoq(N@;%}*)KNexQP zNi4}MOASaY$zUi@>Q0=@%2q1|^00qia4JY+aDHiC3WLa({;89j*iP1i%!f#1=I6Pk zrluq%CTDvj7L;TrGpKTe&jk4`I6tk#KPf9Uxdd!%{leP|!NLVOnMfh)nfGlL$S1)N zVNfVs-uz)NC`5xxiUNxA3sQ?pDjBQ~7O8-BmlTyImrQP8ml6QQTu6R?PDo|}!`4^q z`zFs~*I?A0Y{w)gjv0ZgcDEhW1jz{_<Un=_9x6T#(F2Yplt}v0Qy-@T(jx|z1IHjZ zFpC*#1pM!rgQOG@QkYToZsl!7kO5j;;27#)nHg*Z(j)^5RY-`z!jEBDmWCq4kuU|2 zV88k8D8DjDBQGcoft+nne&!Iw*~O4pO-*qwO-l6z$?czKvcnjpS_U3N(7=VIX8RKc z+b17lj}vmu%Sg;iPE7$PBZjN%PQRHf!qE#(S>VLxmXn`Y!k}8^_i*w;j;?x8-T?a- zC74tsR6PYz5-l{47{9DsEX}~cfa*)vw6xUZl6bKB49;s4XMv&`>;Okd`V^8#-~pNE znOBkuO?{9Q&ieI1y`K2w2Lj@gojDZ^V7_^~;gcaK)1ajH)RNR9q%_Zcd~VI;cuoa* zaRvqkSm2_%iy_}qjdOB6r$#*}VZj3WQna%c$lI8~oX?fF9wi%~1@f=8<;S@g7#P4& z7@k;`%3$^_ZVfo8mn4>CCWGTjDAFMWRz7J#8I!kj^4CW}IZROc<NyEv<DhJFC=H?_ zK?DN>Ln4%Z`2YX^G$@;px;)(K>fr`H`2YWZA#Q~z>WYX^cmMzY|FHzs)iW@F6vBLu z&nF;t@dOQon3q7Ly3~3i6yE#)|356wkR1q%x+JI>FaH1kuL5ObQ<nvmd-nhT|6(Y+ z9$8^DR4^M#KmY&#e-4z5tS$yB26Gh1fyq!YWOXnH=0oM){Qv)70Lq4{gZLj^;j91u z|7V~o1oP0<J^KIue+5{EfdOhDm<Ll=0Om0;y!`+Fe<qZTtS*uPVn0I(R1!piDs2#r zst_c?fTGS1B7|ZwESDgg=Z{Yv)PAs%05FN_6Kn<s5~(hT2z6llgNaZGQUWVM2!#x| zwZ%Z#BVi2C@F!$oILLM)42&RB9V}GMq4tBd!32@x4wjGzIS`g3kk!HTR)S4uV0ilf z|9?v;8?Fu%{xF4AP|4T-|NjToOCT;>Ap-*gy1FO-|Nk!oDMAYwbajva|Nmc(McvQ; z|Nl?+;^7g4mG_zqEDW&xsc1AghsR3{mc>EU2`jXeG&GuQU@SNJ6_1WsF4R~~1_lOL z@-;J=Jdsy!vKOz8SUOZ1RMBmOvfE51Kh#s3yopyuECnhA3Y82{s~Y4HQ?RrUpNbf$ z+5m}yblWgP)Xq0Ukp{U4B<;fjk-lvSmcGQNB323!VE`%l4Are}H`%~gZL$%+1mnla z-uz8WiV~C0^INj%N-!|+8g1qi$dJ?p^$aHb{lDLy0n#%78G{@PAifQVU|?Xdm^@!o zMob&ZgSvqMY^C?)i<;t$7L#9UY6KfW6@WV=vQUl=lm___#Jm6^K#dqE4OR?O<N+0& z4W-2<8}dp>g4!4$0hlbz0WOm#^2$g$fTWNNgvG4S<cYk})(_5HX*>W{ajWEjBbdR! zpa`X51~D)&G}yyDuL_m4n5>{}CJ3_=W~w^KMU(5b1$bfVLCVc1&(YS7k_0gsAmIXK zqLiAf3=9mg9+U-C0o)1y{{R1P1{H*b6{sZ#60(@AsG}zdiZKumyOSDp1W+nDH;__L z+(Bu$MYsO{|L+PF#BjyC|Ns9h;gWp+|NnnyT#}#v|F4JVdkk~${{R197njzzNEJGU z&M*J}|5wJP^EOgVYXK|d;6D9;RKQ@Ed*}cE|C+eW{q+C;e^7=3$z$jQ#SU`h%YjsZ z5+E#%z=GZYlveEZq0$)U{QCd@zaCT)mUTdx94ur9CK(vaCl?whDuLR?AOTRb97MyE zNr5;ZEIs+6fi<Twh{?df;68beZib`@l!raNgz5<}nopjnBRsiMPlM5F@_r*pPEZFH zq{)1;A+HE4$bEK`7wRWWw$;~Q^aQJr2T6m9FOb(5%|Wt~aQ{Q)sNsE3sRS|(?0tJv z5R-v{0iy&06(%$Yn{|euu-R{DjWb;AK|Y^6%?MApOpY?vU=*3$Z0x{jJ2^o|fzf>O zLp|lm944-U$f<{ofq{W}a-4|-BiH0K6J<t?$+Jxq4MC!ybO!1wfjkc?I!cO4QyJKy z#WlLb<QNk>h+a@t%K*v)pzb|L?{x+S27N6p1ujknEd{5X($s>Y%)AnX%-n*URM0R@ zVp2}3LTXuRUWr0levv|XMrxiyNk*zda(-?>ejZ3TvsfW1H9a#gFEcM)0W>J1qmZ1K zlardFkd&I1UzDnlSyHT!Uk;W|tWPe<FH$d7a02NF$VsdO+l$lSl*+us+)R*hl?us4 zsfi`2DGHfsU<WvYOj5{5ELKR&DN0RDsRWr>ng=pd59}L#22qd)85kHq^)}c-g@F2; z#7YK3s5q#f;GC0KT%200?+o)#u|C*jIA1S=!3(PX2&jmrEQsof2qTckP=bhx!BY<o zAFzLrQvs-K0Hp#~a72T`J2eFq>qV6cX+?>-so+4*OwLxwELKR(1Eq-+1uaAXgA!l} dXjqJ3$oiDz7hwxpP#sT#<=}RK_2eMa1OTsS{b2wA delta 2386 zcmX@t!ni4W!VlIqO$G*o$rCx{CdV*|PBvg<;R|A5V6bIkU|?imU|7yM`Lm;XC<6ln z!!b?<1`Y-W1~(oC1_3DFjUS?{j-P>{jh}&G5kCXN4QD00fR_#)YZYH?Uz05LiYHF! z&YBO_zAKu%-nZ}x1%QkNnG-a5A7ijCj{pNhohitC1pfd3|9_CP>=+mrnvmqc&fFZs z)X6wmmBoH@1q(al<g2W{lh;c~PWEFnnY@V2Ve((L+Q}2xPm1$1Ffat?r<M38Wu+#U z1SFPZFw`%+y>Rj_4vWc5oEnphxZ@_TG~}K9o4bTjZt_YVg~^L~GAH-*T2B7UD?Qnq zPoo~@9wjJ)n}LDBwJbHS#Jwo7AcMgHD$E3>zx@CI-x<o*h0-9(9z=kG4N8Ch|Np-i zl#NeaJxHN15eh&3|Nq~QNOk^1sQdW;|9>Y228jRhxe%lf=6gcwT!^&T6|N3qKbVUi zgdmGO!7>aC_$>bL|Nnnj>>;ajgzAOKfz-J}#o+2<7#J8}76(8jK@=!af@rux9O__t zv8tQwXe=CsRR&}<6vLc}tnTOk|No)V46F<c46qcZ$-n~6lpwh_&B@H7UScrcfzmB2 zG@hnuPTpuKH@Q(%N6ZJLl!1YPlYxN&=D*q6lLaN@CO;I_5%Y#hgL3LdDEqbc<cBuu zlfA^0#XJ}wz>tA~K@-Acn4<%hUL~e121>WEd~U-Gkw1zm4RR64a32<kG@}7ncb2%a zSRh1%0i?tbWDElXgRjZtjh1SYPl`)0ewqA8yosfYpMhbrBah7F771y#Y5WWfWty9p zN@PfCg36`|Zz1Ip$ROn41Mxvl2GM$xt&C*!ltD}e1_r1r7{Hd=Kn0<8gNr?okly4L zBaL7U5EFz!(vlzs0|SE!lm>}`m={0<0|SE<lm?fkFhwxI*-%NL$%bMQlEP3POcv%O zi^+l#GLo=z5GD)qCP;(rWI+k($qmN5dS)Ol0|SFBl!obNU|?vlhlPS1R8nv9Zeue} zxM7p$*(ywyG7;c~sRJp~oosHR9VH54GC%?b%0$U^pk!zcmC%FIaI63Q|NmbHDhLZ2 z9w=XL@*WdCL3t<-)hW`Z0&d7o0VM^HLJSK)h9WDJ0;xg@cely>77F%iP*Du+zyAOK zuL_lf#VaUPf`yF1Bm;x)WPWo+B@rl30!qV_i9z`c;*(cfS#!d2gXQG+RvCg?P)StZ z>01ae>P~jBux8Ys>|iO$35!eJ$%bMgtROcTPZqQ>n!MIhZ?d?h2BS4tl{C~WkSYmA zU6=|%YI@lOZU?`)qP;ehhmlD@shf)7(P0e=kD1oE!@~sT+sOqs1j1u-fep)K3tJUN z!O0GmB9jYkbvTWn{*VFXGf>D$C{KQ5>&lOua99`^CLg!6V^o~XX0OP|Jo%)Z4TR0f i#sDcy_$SY|lMn+nEI`JAl6^^0X(~8l8%%!Zm;eAEfIGGT diff --git a/Content/Pawn/BP_RWTHVRPawn_Default.uasset b/Content/Pawn/BP_RWTHVRPawn_Default.uasset index 6171681e8ed6e3a4eae1879d475dac62e33c4c99..3ce2c1750052c1c9c8716ac8370c8468f6230d1f 100644 GIT binary patch delta 10271 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 Yb8^B(j>!er^yp&Iq!~PuJ8zf(0H`N`@&Et; delta 10391 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 diff --git a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp index b7fcb074..fef2fd78 100644 --- a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp +++ b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp @@ -1,5 +1,3 @@ -// Fill out your copyright notice in the Description page of Project Settings. - #include "Interaction/Interactables/IntenSelect/IntenSelectable.h" #include "Interaction/Interactables/IntenSelect/IntenSelectableScoring.h" #include "Interaction/Interactables/IntenSelect/IntenSelectableSinglePointScoring.h" diff --git a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp index 03b04e32..4c44f369 100644 --- a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp +++ b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp @@ -1,9 +1,5 @@ -// Fill out your copyright notice in the Description page of Project Settings. - #include "Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.h" - #include "Kismet/KismetMathLibrary.h" -#include "Net/Core/PushModel/PushModel.h" // Sets default values for this component's properties UIntenSelectableMultiPointScoring::UIntenSelectableMultiPointScoring() diff --git a/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp b/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp index 130b0efe..a49bf068 100644 --- a/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp @@ -19,50 +19,6 @@ UIntenSelectComponent::UIntenSelectComponent(const FObjectInitializer& ObjectIni bShowDebug = false; // otherwise the WidgetInteractionComponent debug vis is shown InteractionSource = EWidgetInteractionSource::Custom; // can also be kept at default (World), this way, however, we // efficiently reuse the line traces - - ConstructorHelpers::FObjectFinder<UStaticMesh> DefaultConeMesh( - TEXT("StaticMesh'/RWTHVRToolkit/IntenSelect/DebugConeMesh.DebugConeMesh'")); - this->DebugConeMesh = DefaultConeMesh.Object; - - ConstructorHelpers::FObjectFinder<UMaterialInterface> DefaultConeMeshMaterial( - TEXT("Material'/RWTHVRToolkit/IntenSelect/DebugConeMaterial.DebugConeMaterial'")); - this->DebugConeMaterial = DefaultConeMeshMaterial.Object; - - ConstructorHelpers::FObjectFinder<UStaticMesh> DefaultSplineMesh( - TEXT("StaticMesh'/RWTHVRToolkit/IntenSelect/sectionedCubeMesh.sectionedCubeMesh'")); - this->SplineMesh = DefaultSplineMesh.Object; - - ConstructorHelpers::FObjectFinder<UStaticMesh> DefaultForwardRayMesh( - TEXT("StaticMesh'/RWTHVRToolkit/IntenSelect/RayMesh.RayMesh'")); - this->ForwardRayMesh = DefaultForwardRayMesh.Object; - - ConstructorHelpers::FObjectFinder<UMaterialInterface> DefaultSplineMaterial( - TEXT("Material'/RWTHVRToolkit/IntenSelect/SelectionSplineMaterial.SelectionSplineMaterial'")); - this->SplineMaterial = DefaultSplineMaterial.Object; - - ConstructorHelpers::FObjectFinder<UMaterialInterface> DefaultForwardRayMaterial( - TEXT("Material'/RWTHVRToolkit/IntenSelect/ForwadRayMaterial.ForwadRayMaterial'")); - this->ForwardRayMaterial = DefaultForwardRayMaterial.Object; - - ConstructorHelpers::FObjectFinder<UHapticFeedbackEffect_Curve> DefaultSelectionFeedbackHaptic( - TEXT("HapticFeedbackEffect_Curve'/RWTHVRToolkit/IntenSelect/OnSelectHapticFeedback.OnSelectHapticFeedback'")); - this->SelectionFeedbackHaptic = DefaultSelectionFeedbackHaptic.Object; - - ConstructorHelpers::FObjectFinder<USoundBase> DefaultOnSelectSound( - TEXT("SoundWave'/RWTHVRToolkit/IntenSelect/OnSelectSound.OnSelectSound'")); - this->OnSelectSound = DefaultOnSelectSound.Object; - - ConstructorHelpers::FObjectFinder<UMaterialParameterCollection> DefaultMaterialParamCollection( - TEXT("MaterialParameterCollection'/RWTHVRToolkit/IntenSelect/ForwardRayParams.ForwardRayParams'")); - this->MaterialParamCollection = DefaultMaterialParamCollection.Object; - - ConstructorHelpers::FObjectFinder<UCurveFloat> DefaultForwardRayTransparencyCurve( - TEXT("CurveFloat'/RWTHVRToolkit/IntenSelect/ForwardRayTransparencyCurve.ForwardRayTransparencyCurve'")); - this->ForwardRayTransparencyCurve = DefaultForwardRayTransparencyCurve.Object; - - ConstructorHelpers::FObjectFinder<UInputAction> InputActionClick( - TEXT("/Script/EnhancedInput.InputAction'/RWTHVRToolkit/IntenSelect/IntenSelectClick.IntenSelectClick'")); - this->InputClick = InputActionClick.Object; } // Called when the game starts diff --git a/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h b/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h index 3add1cac..272755be 100644 --- a/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h +++ b/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h @@ -12,7 +12,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnNewComponent); -UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent), Blueprintable) +UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent), Abstract) class RWTHVRTOOLKIT_API UIntenSelectComponent : public UWidgetInteractionComponent { GENERATED_BODY() @@ -59,15 +59,6 @@ private: UPROPERTY() UMaterialParameterCollectionInstance* ParameterCollectionInstance; - UPROPERTY() - UStaticMesh* DebugConeMesh; - - UPROPERTY() - UMaterialInterface* DebugConeMaterial; - - UPROPERTY() - UStaticMesh* ForwardRayMesh; - #pragma endregion #pragma region /** SETTINGS */ @@ -92,18 +83,33 @@ public: public: UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UStaticMesh* SplineMesh; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UMaterialInterface* SplineMaterial; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UMaterialInterface* ForwardRayMaterial; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UHapticFeedbackEffect_Base* SelectionFeedbackHaptic; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") USoundBase* OnSelectSound; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UMaterialParameterCollection* MaterialParamCollection; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UCurveFloat* ForwardRayTransparencyCurve; + + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") + UStaticMesh* ForwardRayMesh; + + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") + UMaterialInterface* DebugConeMaterial; + + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") + UStaticMesh* DebugConeMesh; #pragma endregion #pragma region /** DEBUG */ -- GitLab