From 9974693017030d3ce107dcb3a3a2cdb91195470a Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Tue, 8 Sep 2015 23:24:57 -0400 Subject: [PATCH 01/10] initial files --- VRIS-prototype/.gitattributes | 1 + VRIS-prototype/Config/DefaultEditor.ini | 5 ++ VRIS-prototype/Config/DefaultEngine.ini | 60 +++++++++++++++++++ VRIS-prototype/Config/DefaultGame.ini | 6 ++ VRIS-prototype/Source/VRISprototype.Target.cs | 25 ++++++++ .../Source/VRISprototype/ReadFile.cpp | 12 ++++ .../Source/VRISprototype/ReadFile.h | 12 ++++ .../VRISprototype/VRISprototype.Build.cs | 26 ++++++++ .../Source/VRISprototype/VRISprototype.cpp | 5 ++ .../Source/VRISprototype/VRISprototype.h | 6 ++ .../Source/VRISprototypeEditor.Target.cs | 25 ++++++++ VRIS-prototype/VRISprototype.uproject | 16 +++++ 12 files changed, 199 insertions(+) create mode 100644 VRIS-prototype/.gitattributes create mode 100644 VRIS-prototype/Config/DefaultEditor.ini create mode 100644 VRIS-prototype/Config/DefaultEngine.ini create mode 100644 VRIS-prototype/Config/DefaultGame.ini create mode 100644 VRIS-prototype/Source/VRISprototype.Target.cs create mode 100644 VRIS-prototype/Source/VRISprototype/ReadFile.cpp create mode 100644 VRIS-prototype/Source/VRISprototype/ReadFile.h create mode 100644 VRIS-prototype/Source/VRISprototype/VRISprototype.Build.cs create mode 100644 VRIS-prototype/Source/VRISprototype/VRISprototype.cpp create mode 100644 VRIS-prototype/Source/VRISprototype/VRISprototype.h create mode 100644 VRIS-prototype/Source/VRISprototypeEditor.Target.cs create mode 100644 VRIS-prototype/VRISprototype.uproject diff --git a/VRIS-prototype/.gitattributes b/VRIS-prototype/.gitattributes new file mode 100644 index 0000000..77b165a --- /dev/null +++ b/VRIS-prototype/.gitattributes @@ -0,0 +1 @@ +VRISprototype.sdf filter=lfs diff=lfs merge=lfs -text diff --git a/VRIS-prototype/Config/DefaultEditor.ini b/VRIS-prototype/Config/DefaultEditor.ini new file mode 100644 index 0000000..6838df0 --- /dev/null +++ b/VRIS-prototype/Config/DefaultEditor.ini @@ -0,0 +1,5 @@ +[EditoronlyBP] +bAllowClassAndBlueprintPinMatching=true +bReplaceBlueprintWithClass=true +bDontLoadBlueprintOutsideEditor=true +bBlueprintIsNotBlueprintType=true diff --git a/VRIS-prototype/Config/DefaultEngine.ini b/VRIS-prototype/Config/DefaultEngine.ini new file mode 100644 index 0000000..c55599d --- /dev/null +++ b/VRIS-prototype/Config/DefaultEngine.ini @@ -0,0 +1,60 @@ +[URL] +[/Script/EngineSettings.GameMapsSettings] +EditorStartupMap=/Game/StarterContent/Maps/Minimal_Default +GameDefaultMap=/Game/StarterContent/Maps/Minimal_Default + +[/Script/Engine.UserInterfaceSettings] +RenderFocusRule=NavigationOnly +DefaultCursor=None +TextEditBeamCursor=None +CrosshairsCursor=None +GrabHandCursor=None +GrabHandClosedCursor=None +SlashedCircleCursor=None +ApplicationScale=1.000000 +UIScaleRule=ShortestSide +CustomScalingRuleClass=None +UIScaleCurve=(EditorCurveData=(PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,Keys=((Time=480.000000,Value=0.444000),(Time=720.000000,Value=0.666000),(Time=1080.000000,Value=1.000000),(Time=8640.000000,Value=8.000000))),ExternalCurve=None) + +[/Script/Engine.RendererSettings] +r.MobileHDR=True +r.MobileNumDynamicPointLights=4 +r.MobileDynamicPointLightsUseStaticBranch=True +r.AllowOcclusionQueries=True +r.MinScreenRadiusForLights=0.030000 +r.MinScreenRadiusForDepthPrepass=0.030000 +r.PrecomputedVisibilityWarning=False +r.TextureStreaming=True +Compat.UseDXT5NormalMaps=False +r.AllowStaticLighting=True +r.NormalMapsForStaticLighting=False +r.GenerateMeshDistanceFields=False +r.GenerateLandscapeGIData=True +r.TessellationAdaptivePixelsPerTriangle=48.000000 +r.SeparateTranslucency=True +r.TranslucentSortPolicy=0 +TranslucentSortAxis=(X=0.000000,Y=-1.000000,Z=0.000000) +r.CustomDepth=1 +r.DefaultFeature.Bloom=True +r.DefaultFeature.AmbientOcclusion=True +r.DefaultFeature.AmbientOcclusionStaticFraction=True +r.DefaultFeature.AutoExposure=True +r.DefaultFeature.MotionBlur=True +r.DefaultFeature.LensFlare=True +r.DefaultFeature.AntiAliasing=2 +r.EarlyZPass=3 +r.EarlyZPassMovable=False +r.DBuffer=False +r.ClearSceneMethod=1 +r.BasePassOutputsVelocity=False +r.WireframeCullThreshold=5.000000 +UIScaleRule=ShortestSide +UIScaleCurve=(EditorCurveData=(PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,Keys=),ExternalCurve=None) + +[/Script/HardwareTargeting.HardwareTargetingSettings] +TargetedHardwareClass=Desktop +AppliedTargetedHardwareClass=Desktop +DefaultGraphicsPerformance=Maximum +AppliedDefaultGraphicsPerformance=Maximum + + diff --git a/VRIS-prototype/Config/DefaultGame.ini b/VRIS-prototype/Config/DefaultGame.ini new file mode 100644 index 0000000..15de8ee --- /dev/null +++ b/VRIS-prototype/Config/DefaultGame.ini @@ -0,0 +1,6 @@ +[/Script/EngineSettings.GeneralProjectSettings] +ProjectID=03D8975F4EA14BB07FC38BA6364CCA52 + +[StartupActions] +bAddPacks=True +InsertPack=(PackSource="StarterContent.upack,PackName="StarterContent") diff --git a/VRIS-prototype/Source/VRISprototype.Target.cs b/VRIS-prototype/Source/VRISprototype.Target.cs new file mode 100644 index 0000000..f7732c2 --- /dev/null +++ b/VRIS-prototype/Source/VRISprototype.Target.cs @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +using UnrealBuildTool; +using System.Collections.Generic; + +public class VRISprototypeTarget : TargetRules +{ + public VRISprototypeTarget(TargetInfo Target) + { + Type = TargetType.Game; + } + + // + // TargetRules interface. + // + + public override void SetupBinaries( + TargetInfo Target, + ref List OutBuildBinaryConfigurations, + ref List OutExtraModuleNames + ) + { + OutExtraModuleNames.AddRange( new string[] { "VRISprototype" } ); + } +} diff --git a/VRIS-prototype/Source/VRISprototype/ReadFile.cpp b/VRIS-prototype/Source/VRISprototype/ReadFile.cpp new file mode 100644 index 0000000..84ef4f1 --- /dev/null +++ b/VRIS-prototype/Source/VRISprototype/ReadFile.cpp @@ -0,0 +1,12 @@ +#include "VRISprototype.h" +#include "ReadFile.h" +#include "CoreMisc.h" + +void UReadFile::ReadFile(FString Filename, FString& Result) +{ + FFileHelper::LoadFileToString(Result, *Filename); +} + + + + diff --git a/VRIS-prototype/Source/VRISprototype/ReadFile.h b/VRIS-prototype/Source/VRISprototype/ReadFile.h new file mode 100644 index 0000000..e00e36c --- /dev/null +++ b/VRIS-prototype/Source/VRISprototype/ReadFile.h @@ -0,0 +1,12 @@ +#pragma once + +#include "Kismet/BlueprintFunctionLibrary.h" +#include "ReadFile.generated.h" + +UCLASS() +class VRISPROTOTYPE_API UReadFile : public UBlueprintFunctionLibrary +{ + GENERATED_BODY() public: + UFUNCTION(BlueprintCallable, meta = (DisplayName = "Read File", Keywords = "Reads from a file"), Category = Utilities) + static void ReadFile(FString Directory, FString& Value); +}; diff --git a/VRIS-prototype/Source/VRISprototype/VRISprototype.Build.cs b/VRIS-prototype/Source/VRISprototype/VRISprototype.Build.cs new file mode 100644 index 0000000..e25e9ff --- /dev/null +++ b/VRIS-prototype/Source/VRISprototype/VRISprototype.Build.cs @@ -0,0 +1,26 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +using UnrealBuildTool; + +public class VRISprototype : ModuleRules +{ + public VRISprototype(TargetInfo Target) + { + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); + + PrivateDependencyModuleNames.AddRange(new string[] { }); + + // Uncomment if you are using Slate UI + // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); + + // Uncomment if you are using online features + // PrivateDependencyModuleNames.Add("OnlineSubsystem"); + // if ((Target.Platform == UnrealTargetPlatform.Win32) || (Target.Platform == UnrealTargetPlatform.Win64)) + // { + // if (UEBuildConfiguration.bCompileSteamOSS == true) + // { + // DynamicallyLoadedModuleNames.Add("OnlineSubsystemSteam"); + // } + // } + } +} diff --git a/VRIS-prototype/Source/VRISprototype/VRISprototype.cpp b/VRIS-prototype/Source/VRISprototype/VRISprototype.cpp new file mode 100644 index 0000000..7c1fffc --- /dev/null +++ b/VRIS-prototype/Source/VRISprototype/VRISprototype.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "VRISprototype.h" + +IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, VRISprototype, "VRISprototype" ); diff --git a/VRIS-prototype/Source/VRISprototype/VRISprototype.h b/VRIS-prototype/Source/VRISprototype/VRISprototype.h new file mode 100644 index 0000000..3d85d22 --- /dev/null +++ b/VRIS-prototype/Source/VRISprototype/VRISprototype.h @@ -0,0 +1,6 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "Engine.h" + diff --git a/VRIS-prototype/Source/VRISprototypeEditor.Target.cs b/VRIS-prototype/Source/VRISprototypeEditor.Target.cs new file mode 100644 index 0000000..9d767c6 --- /dev/null +++ b/VRIS-prototype/Source/VRISprototypeEditor.Target.cs @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +using UnrealBuildTool; +using System.Collections.Generic; + +public class VRISprototypeEditorTarget : TargetRules +{ + public VRISprototypeEditorTarget(TargetInfo Target) + { + Type = TargetType.Editor; + } + + // + // TargetRules interface. + // + + public override void SetupBinaries( + TargetInfo Target, + ref List OutBuildBinaryConfigurations, + ref List OutExtraModuleNames + ) + { + OutExtraModuleNames.AddRange( new string[] { "VRISprototype" } ); + } +} diff --git a/VRIS-prototype/VRISprototype.uproject b/VRIS-prototype/VRISprototype.uproject new file mode 100644 index 0000000..99cc903 --- /dev/null +++ b/VRIS-prototype/VRISprototype.uproject @@ -0,0 +1,16 @@ +{ + "FileVersion": 3, + "EngineAssociation": "4.9", + "Category": "", + "Description": "", + "Modules": [ + { + "Name": "VRISprototype", + "Type": "Runtime", + "LoadingPhase": "Default", + "AdditionalDependencies": [ + "Engine" + ] + } + ] +} \ No newline at end of file From a1309bdcbf7b9ac01d612b57e575c6ec536f76a6 Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Tue, 8 Sep 2015 23:34:06 -0400 Subject: [PATCH 02/10] Create README.md --- VRIS-prototype/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 VRIS-prototype/README.md diff --git a/VRIS-prototype/README.md b/VRIS-prototype/README.md new file mode 100644 index 0000000..9161288 --- /dev/null +++ b/VRIS-prototype/README.md @@ -0,0 +1 @@ +Prototype for VRIS. From 0f70d5b9d88eb2a3c87709e2f011af971c37c91d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Sep 2015 23:08:16 -0400 Subject: [PATCH 03/10] updated Transfer.py, and added .gitignore --- VRIS-prototype/.gitignore | 5 +++++ VRIS-prototype/VRISprototype.v12.suo | Bin 0 -> 25600 bytes 2 files changed, 5 insertions(+) create mode 100644 VRIS-prototype/.gitignore create mode 100644 VRIS-prototype/VRISprototype.v12.suo diff --git a/VRIS-prototype/.gitignore b/VRIS-prototype/.gitignore new file mode 100644 index 0000000..f1ed149 --- /dev/null +++ b/VRIS-prototype/.gitignore @@ -0,0 +1,5 @@ +Intermediate/ +Saved/ +VRISprototype.sdf +VRISprototype.sln +VRISprototype.suo \ No newline at end of file diff --git a/VRIS-prototype/VRISprototype.v12.suo b/VRIS-prototype/VRISprototype.v12.suo new file mode 100644 index 0000000000000000000000000000000000000000..3feaf22e42e28ea43692ddc096eca30ab5b063aa GIT binary patch literal 25600 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 J{<9Go_ Date: Wed, 9 Sep 2015 23:11:16 -0400 Subject: [PATCH 04/10] Changed to untracked file --- VRIS-prototype/VRISprototype.v12.suo | Bin 25600 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 VRIS-prototype/VRISprototype.v12.suo diff --git a/VRIS-prototype/VRISprototype.v12.suo b/VRIS-prototype/VRISprototype.v12.suo deleted file mode 100644 index 3feaf22e42e28ea43692ddc096eca30ab5b063aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25600 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 J{<9Go_ Date: Wed, 23 Sep 2015 23:38:16 -0400 Subject: [PATCH 05/10] added lightsaber + blueprint --- VRIS-prototype/VRISprototype.v12.suo | Bin 0 -> 15872 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 VRIS-prototype/VRISprototype.v12.suo diff --git a/VRIS-prototype/VRISprototype.v12.suo b/VRIS-prototype/VRISprototype.v12.suo new file mode 100644 index 0000000000000000000000000000000000000000..2642e8d34b1ff80cddd49a96a2d6cd12a14b5549 GIT binary patch literal 15872 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 MR<;JW)%Jh?2iT|O{Qv*} literal 0 HcmV?d00001 From 20342e27f745a74d96d342781fc318fb0de3f992 Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Sun, 11 Oct 2015 23:12:27 -0400 Subject: [PATCH 06/10] added more for positioning of bullet --- VRIS-prototype/VRISprototype.v12.suo | Bin 15872 -> 32256 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/VRIS-prototype/VRISprototype.v12.suo b/VRIS-prototype/VRISprototype.v12.suo index 2642e8d34b1ff80cddd49a96a2d6cd12a14b5549..7c8477e73f4331886cbddcd3792988c15ffcb8cc 100644 GIT binary patch literal 32256 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 delta 1679 zcmdT_OK1~O6n$?pQztQPt@e``ZJMg}Ln;$(`q2v0B(*iEjYaYQX|)>M6vaersyI6r zifHaeK@f2z;zH_9lt8<3Qy1al-fqiWJnEE{SX>R1B9uoc6Hn?Dpd97& zVJgITs!PhLLzGDjI%Pe$g=M^U0E1DQYe=XbrVpQKCPQ(_{gm+}bxu-E*=jjR1rJi* zyM-)oS{uOBE}Dx@$OL6#7iF9ZOOrZB(^$5N@+noe(0K2qTw_e9TjJ?Mqopkd@rB0y3B3VUUD>q8vJ{$2#3{NBY6hm9(#2HS8cJ`!l5?juC%8K_ z?w*i372HMnm1#Gp%p=j@$wgv%E&3|phXiZADl2F_@{FeH!q_|%NYHe3cYmom+;h!1 zOyKC7fVLN8+iO$xQwRy%x6spVl;E8%5Y%x2WEYqSgF+i?bWL}h7^nf#{oN< q>qDu3_omXhXoCM1w4*rw%`e|4e%XHieWLsY&bE2iJS)E^-uwn)Liv&a From 7cf359df504c2f9bbae9025a32da9036d36fd76b Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Sun, 3 Jan 2016 23:40:57 -0500 Subject: [PATCH 07/10] more debugging --- VRIS-prototype/VRISprototype.v12.suo | Bin 32256 -> 32256 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/VRIS-prototype/VRISprototype.v12.suo b/VRIS-prototype/VRISprototype.v12.suo index 7c8477e73f4331886cbddcd3792988c15ffcb8cc..668fe330ce2dfa0eb8e7fdb8a9b9d8a793e68757 100644 GIT binary patch literal 32256 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 Na_W}+cR6KQ=Kud;-V6W$ delta 4701 zcmds4du&tJ8Nc`DCb9Ey3?alMF)A2&`GLlb8_l^88?V zp#+T$wxu2Qx3W=ask&;b+KQ<&YBj0aQi>`%QI)Dpsob!F>ocle_`M%@XTm0-T{&*vw^LkU3z^iDTP^fVyAHH-_{E*+op?rZR zg-QNZT1auJ?x3syjjoz<=$eqtzd+$6m#PRPor3H=gMkWQg)#ri7RJkMv@1blZK9-L ztOhawO`Nw8ZGz9*wD>p^tw>#BLvlKL$@Gl4LuEm)9*F)y?B^Gi$h`KKnI$EfX+oId zUw#-J)+lvI$Pv?p{;bZnFbxt^t)kDQW|}cAvVd%WS!^|s3f!hWVr@)v)!mZo_=vWk z{TQ2s4HB4(kDo&O9pE_dG!Ov@_%84aa02)q@O>b$_7pvxo=-=#B~&MBU-!s-WMzmi zqHx9xzkwDqoNAt_zzmvjXrx}G@yyv&9S?9F^@upbB{{ef<eaT<1wkT75UF`u6{$0jp`=7iQml)H zO6K^8B&!S{iV6mQlEPA_$efw@2LB{2NO4P+DCjXuR=Vlp#(H*xP6X}SsGz06gCM*WqE*q3hLd@h%tcTz>NYsV@tn1;v|qvgKA%b1!_o>GCqiQmEtuHMb5z zZD4A~qgXUlIwz1hT}#@u{p$+BF#v29J5Y(s#8hF%zfC8_d~G>;6$&n0Nb{FDL2vw4yiu+S zJ1C0&X#4oy6qEeJ^I6XwIXAV3SMWsr%n-X1jJEIk>2swCCd&=q_}%gIzY3gcrsx|f z7kB;mrjqwb==O`YH!rU^o5zkXvc#dx;w}Dn9bY^3QqrddNzCLP1mb?CO)qKFT9s^=N!_YRxRl>wJ zPJ)>S=xw=z=P223M)3J5J=v{$(In6(%{%B%-OiMhF3!%G$+LS`1}xlyK^1(#(c6w{ zwF#R@oXpkI&mFZ}mqwsSs79_9zg1Xagb&&0YS60##e#i|oE6kXz8w_i^A?QFbY@#= zyBShWVQwX6SwT0WR$&eMz6lhzqYSPEJ$6bYfYGY4#vEH^0Zqmj`?4K*Grgy;&AI2< z0)HbSQv=JC^u8lE(}x?t&TkW555;U<{yo>h4h@`}@muf5FNeerb!O>~(+F8x^)7m2 z>-uCSl`S@Ut#vK^=80n79v?aBtal}O^mQaV-Q?77M_WX{Xx&UtIaA`}JUZd3SM)XX zmOhQzo+ysdI`$f{W7*O^9edr1{%Sg_*O1mz7N5(;I?8Yv;=ZxM4-R;v7WTHo;>XgM=(^4r*W+R#^quJ3?YqYjhTa2}qni@x)#nxgrS*Ryi zFwmmlmK_XoxfOxx;v+<~!yfOo{;7##Kmd+h$fKEqb;2)gESOOJhYU~tse(>WFn z^!a)^!lR+V5nqC88}C(u!ZldV}YR__po=u7w8Om1EKQ$)6-M3WUsVV+iHw0 zRglJPCub;!&JJk!`>7-foXmLoNU=@L!QUJU{E3vn;-c^hN0Y^q#2yXTi+9A53VSq+ zZ)zhsSEA1<3P`IltF&0R?2*t-Va*J`3;7%wkfji1225tzEld+xM=7$Ug>G7lqWi|b z#Q$TI{xH92@eQFPtz>@irwHV1qS?xA%9ls>b~VSu#64S5k$;}Tt7iD;XaT>cDV)y`~xPw#`n$2&6wlJ#%d z?{|eCD(%qM<%ZOF{-AZOmYIJq7ktiC06WABl?$n~-m{8c_UaHUG&CFlySwO`Q-=_;7&bCo8vKhGjy(*TIHU@c22Mse zGSa-G=Km-BuUZ!Vq2&}p7PSWt-yzs3WZ5@eZH2-{2Y@p7^o{AA9@}#&Z&aMO1-*9J7bS6}ZN+!k*5tLVNo* zP~(6mHHeGT$Muk3UQJECxsfsUm|c}XboRhJPnY%5f6WV`h|c#m(yggBx;Rotv(p!l zSQ?>Yb5aBMAAeiW6_1mo-lE7@A^TGt%^v+DpLP{laq(S172%Kg50EW?MD?Lk Date: Tue, 5 Jan 2016 20:56:36 -0500 Subject: [PATCH 08/10] Arduino, and shortcut for game startup --- VRIS-prototype/Xylos.exe.lnk | Bin 0 -> 2072 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 VRIS-prototype/Xylos.exe.lnk diff --git a/VRIS-prototype/Xylos.exe.lnk b/VRIS-prototype/Xylos.exe.lnk new file mode 100644 index 0000000000000000000000000000000000000000..d9b710208803bab1fa4e4db7f51c413172cdb73f GIT binary patch literal 2072 zcmcgtZ){Ul6#s2(W|K}^Hs)MZnq?5CQrfO`V-W*%?Q6+&brUwt%SO{Z#vAKv>57>l zAZkzfq&V^Iq3Y9r#IabMC$8 z+kYd7$i*T&;&vapA1eb5YHri)WDp)xSsMPK#(`){v(mC|7fl%y zqX0KPy&gIqmNgf54Lw!JerL{kgE>1BT!bjnNTQp43<=T>K}Rn%^l`^p_FFmc<*ycA zxX@+JAH@o49@L@UISgn-U#45N`ir`$5Zccl(eiM9TzM8g0 zcsh$zt^8C%o<_HBXu#t+w1E;?5ww>s6tVvsNqlY;k)^?S>Fnu>ay*;E93bX;-H4@i zjp1AW7t{e0bjgehmSFk+@H05y5GNR)q?zv3yJTdrw;uJPA3O-5~ z@iVNSG$X8`-;Bru^hr}>luXOGf+B4@#X(s>QEb0D?Hs}Kj;52{=~%)U(tEW&HJH-l zP9>J$l*v}DG^sO@Rn0)CLcdGTB-1XfpNUw702-j)p`O)w>r2g6hpf)#RsBak)H$*2 zKoxh(X^s5$ICk*nX!OqTzNn0i!SC0Y%U)Kpb-#M3$Fu93(1HkBS?hB1BzhS^FQ;{qkA^Lr@1T}pPJ~&Eeokhfn=|1lF)sv$mvQ`%BKcWJ z{eyVNYoDEYGBWm-cG5d_zEajUQ<$sac8=1v_4Q=5_*P3{zyHnh%Kf)`!UqDD{-tf_7s0f1L6fIhbvTBIK^T+#dS4sXp-0Z>6sE2He8 ztfI*KD4L%luVfwEwEN994{Oe{dugwwW_i?cbkozzv6f!7CW4zb>m87@PEdr5`{vS< zH Date: Fri, 8 Jan 2016 10:50:24 -0500 Subject: [PATCH 09/10] changed animation --- .../MPU6050_Multi/MPU6050_Multi.ino | 146 ++++++++++++++++++ VRIS-prototype/Xylos.exe.lnk | Bin 2072 -> 2126 bytes 2 files changed, 146 insertions(+) create mode 100644 VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino diff --git a/VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino b/VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino new file mode 100644 index 0000000..4f5fa7a --- /dev/null +++ b/VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino @@ -0,0 +1,146 @@ +#include "Wire.h" +/* I2Cdev and MPU6050 must be installed as libraries, or else the .cpp/.h files + * for both classes must be in the include path of your project + */ +#include "I2Cdev.h" +#include "MPU6050_6Axis_MotionApps20.h" + +#define NUMBER_OF_SENSORS 3 /// YOU MAY NEED TO CHANGE THIS + +// Default I2C address is 0x68 +// AD0 LOW(0) = 0x68 (Default for SparkFun breakout and InvenSense evaluation board) +// AD0 HIGH(1) = 0x69 + +// MPU Control Variables +MPU6050 mpu; +bool dmpReady; // Set true if DMP init was successful. +uint8_t devStatus; // Return status after each device operation. (0 = success, !0 = error) +uint8_t mpuIntStatus; // Holds interrupt status byte from MPU. +uint16_t packetSize; // Expected DMP packet size. (Default is 42 bytes) +uint16_t fifoCount; // Count of all bytes currently in FIFO. +uint8_t fifoBuffer[64]; // FIFO storage buffer. + +// Orientation and Motion Variables +Quaternion q; // [W, X, Y, Z] Quaternion container. +VectorFloat gravity; // [X, Y, Z] Gravity vector +float ypr[3]; // [Yaw, Pitch, Roll] array container. + +//Digital Pins Reference Variables +/* Displace array beginning with 0. + * The numbers after the 0th index correspond to the pin connected to the ADO line of each sensor. + */ +int sensorPins[NUMBER_OF_SENSORS + 1] = {0, 5, 6, 7}; // {none, Sensor 1 ADO pin, Sensor 2 ADO pin,...} + +// Other Variables +String finalParts[NUMBER_OF_SENSORS]; // Final output. +String final = ""; // Part of final output. + +//============================================================== + +void switchSensor(int sensorNumber) { + digitalWrite(sensorPins[sensorNumber], LOW); // Change one ADO line to low. (The one we are recieving from! 0x68) +} + +// ================================================================ +// === MAIN PROGRAM SETUP === +// ================================================================ + +void setup() { + + // Setup Variables + int i = 0; // For loop counter. + int dmpReadyCounter = 0; // Counts number of sensors ready. + + // Set all ADO lines to default high, and configure pins. + for(i = 1; i <= NUMBER_OF_SENSORS; i++) { + pinMode(sensorPins[i], OUTPUT); + digitalWrite(sensorPins[i], HIGH); + } + + Serial.begin(115200); // Initialize serial communication with baud rate. + + for (i = 1; i <= NUMBER_OF_SENSORS; i++) { + /* We read data from all sensors by switching addresses one by one, only reading from the first address (0x68). + * Therefore, we select sensors by making an ADO line LOW. + */ + switchSensor(i); + + Wire.begin(); // Joins I2C bus. (I2C libary doesn't do this on it's own.) + TWBR = 24; // Sets SCL higher. + + mpu.initialize(); // Intialize device. + + devStatus = mpu.dmpInitialize(); // Load and configure the DMP. (Digital Motion Processor) + + // Gyroscope offsets. (Change if necessary) + mpu.setXGyroOffset(220); + mpu.setYGyroOffset(76); + mpu.setZGyroOffset(-85); + mpu.setZAccelOffset(1788); + + // Check success of DMP. + if (devStatus == 0) { + mpu.setDMPEnabled(true); + + dmpReadyCounter += 1; // Add one to count number of ready sensors. + + packetSize = mpu.dmpGetFIFOPacketSize(); // Get expected DMP packet size for later comparison + + } else { + // Error! + Serial.println("Error on sensor " + String(i)); + } + digitalWrite(sensorPins[i], HIGH); // Reset current ADO pin back to high. (0x69) + Wire.endTransmission(); // End transmission for sensor. + } + if (dmpReadyCounter == NUMBER_OF_SENSORS) { + dmpReady = true; // Set DMP Ready flag. (Allows main loop to use the DMP.) + } +} + +// ================================================================ +// === MAIN PROGRAM LOOP === +// ================================================================ + +void loop() { + // If DMP isn't ready... + if (!(dmpReady)) { + return; + } + + final = ""; // Reset final to nothing. + + for (int i = 1; i <= NUMBER_OF_SENSORS; i++) { + + switchSensor(i); + + // Check for overflow. + if (fifoCount == 1024) { + mpu.resetFIFO(); // Reset so we can continue cleanly. + } else { + fifoCount = mpu.getFIFOCount(); // Get current FIFO count. + + // Wait for correct avaliable data length. + while (fifoCount < packetSize) { + fifoCount = mpu.getFIFOCount(); + } + + mpu.getFIFOBytes(fifoBuffer, packetSize); // Read a packet from FIFO + /* Track FIFO count in case there is more than 1 packet avaliable. + * (Read more without waiting for an interrupt.) + */ + fifoCount -= packetSize; + + // Get values to process. + mpu.dmpGetQuaternion(&q, fifoBuffer); + mpu.dmpGetGravity(&gravity, &q); + mpu.dmpGetYawPitchRoll(ypr, &q, &gravity); + + // Concatenate for outputting. (Displays in Euler Angles in degrees.) + finalParts[i - 1] = String(ypr[0] * 180 / M_PI) + "," + String(ypr[1] * 180 / M_PI) + "," + String(ypr[2] * 180 / M_PI) + ":"; + final += finalParts[i - 1]; + digitalWrite(sensorPins[i], HIGH); // Resets current ADO pin back to high. (0x69) + } + } + Serial.println(final.substring(0, final.length() - 1)); // Prints and removes extra colon. +} diff --git a/VRIS-prototype/Xylos.exe.lnk b/VRIS-prototype/Xylos.exe.lnk index d9b710208803bab1fa4e4db7f51c413172cdb73f..66887b9a2d15c52b9cc33716887f1773e8717921 100644 GIT binary patch delta 72 zcmbOsa86*uS7ye_$={gwnkq2pGNdx(GL$mpFeEaR0NKT0vIxk^X8_5jf#q_5;>ipk N(Nu=K&6`-#m;u?75=8(2 delta 18 acmX>nFhgL&S7yez$={gwZhpy<$_xNaR0rPx From 4f15d94217cfac497baccc286b81891bb2f53546 Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Thu, 14 Jan 2016 20:47:19 -0500 Subject: [PATCH 10/10] final polish --- .../VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino b/VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino index 4f5fa7a..42a989a 100644 --- a/VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino +++ b/VRIS-prototype/Source/VRISprototype-external/MPU6050_Multi/MPU6050_Multi.ino @@ -71,12 +71,6 @@ void setup() { mpu.initialize(); // Intialize device. devStatus = mpu.dmpInitialize(); // Load and configure the DMP. (Digital Motion Processor) - - // Gyroscope offsets. (Change if necessary) - mpu.setXGyroOffset(220); - mpu.setYGyroOffset(76); - mpu.setZGyroOffset(-85); - mpu.setZAccelOffset(1788); // Check success of DMP. if (devStatus == 0) { @@ -144,3 +138,4 @@ void loop() { } Serial.println(final.substring(0, final.length() - 1)); // Prints and removes extra colon. } +