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.

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

Feature/poll dev #180

Merged
merged 26 commits into from
Feb 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2304918
Initial Setup for saving polls
Togira-Ikonoka Jan 30, 2021
4c8dfb4
Added Save Option to poll creation
Togira-Ikonoka Jan 30, 2021
f5d1e25
saving and loadin polls in project
Togira-Ikonoka Jan 31, 2021
16bc9cf
restructured and tested saving
Togira-Ikonoka Jan 31, 2021
98f941c
added loading of saved polls
Togira-Ikonoka Feb 2, 2021
9cc8fc1
Paging and start populating at the top shelfboard
Togira-Ikonoka Feb 3, 2021
f135ffa
Fixed, tested and polished SaveLoad
Seneral Feb 4, 2021
5716ba8
Merge pull request #176 from rwth-acis/feature/poll-dev-saveloadsystem
Togira-Ikonoka Feb 4, 2021
01a2e6a
Added Voter display for public polls
Seneral Feb 4, 2021
0cb9698
Added button to stop poll early
Togira-Ikonoka Feb 6, 2021
5884484
display poll question
Togira-Ikonoka Feb 6, 2021
f738e27
First synchronized Visualizations
Seneral Feb 6, 2021
5847702
Fixed Synchronization
Seneral Feb 6, 2021
3d64fa0
Synchronization fixes
Seneral Feb 6, 2021
081fe44
Big red beautiful button
Seneral Feb 6, 2021
c09bc90
Added Realtime Visualization
Seneral Feb 6, 2021
185fb3c
Fixed two errors
Seneral Feb 6, 2021
454439b
Fixed more errors
Seneral Feb 7, 2021
05228cf
Final fixes to realtime viz and sync
Seneral Feb 7, 2021
9899d45
Merge pull request #179 from rwth-acis/feature/poll-dev-realtimesync
Togira-Ikonoka Feb 7, 2021
f334072
Consistent formatting
Seneral Feb 7, 2021
191b03e
Restored file that was unintentionally deleted
Seneral Feb 7, 2021
136be00
Changed handling of PollSerializer Object
Togira-Ikonoka Feb 7, 2021
d80572f
fixed typo
Togira-Ikonoka Feb 7, 2021
9ebf13d
Fixed Loading to synchronize poll lists
Togira-Ikonoka Feb 7, 2021
332e01d
Consitent bar coloring
Togira-Ikonoka Feb 7, 2021
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 not shown.
105 changes: 105 additions & 0 deletions Frontend/VIAProMa/Assets/3D Models/PollResults.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

177 changes: 177 additions & 0 deletions Frontend/VIAProMa/Assets/Materials/Big Red Button.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Big Red Button
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_ShaderKeywords: _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP _HOVER_LIGHT _REFLECTIONS
_SPECULAR_HIGHLIGHTS
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ChannelMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescentSpectrumMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
- _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
- _BorderLightReplacesAlbedo: 0
- _BorderLightUsesHoverColor: 0
- _BorderMinValue: 0.1
- _BorderWidth: 0.1
- _BumpScale: 1
- _ClippingBorder: 0
- _ClippingBorderWidth: 0.025
- _ClippingBox: 0
- _ClippingPlane: 0
- _ClippingSphere: 0
- _ColorWriteMask: 15
- _CullMode: 2
- _CustomMode: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DirectionalLight: 1
- _DstBlend: 0
- _EdgeSmoothingValue: 0.002
- _EnableChannelMap: 0
- _EnableEmission: 0
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
- _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
- _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _IgnoreZScale: 0
- _IndependentCorners: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
- _Iridescence: 0
- _IridescenceAngle: -0.78
- _IridescenceIntensity: 0.5
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
- _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProximityLight: 0
- _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 1
- _Refraction: 0
- _RefractiveIndex: 0
- _RenderQueueOverride: -1
- _RimLight: 0
- _RimPower: 0.25
- _RoundCornerMargin: 0.01
- _RoundCornerRadius: 0.25
- _RoundCorners: 0
- _Smoothness: 0.706
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SphericalHarmonics: 0
- _SrcBlend: 1
- _Stencil: 0
- _StencilComparison: 0
- _StencilOperation: 0
- _StencilReference: 0
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
- _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _Color: {r: 0.7924528, g: 0.08873098, b: 0.063545756, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/Materials/Big Red Button.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions Frontend/VIAProMa/Assets/Prefabs/Managers.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ MonoBehaviour:
voiceDetection: 1
voiceDetectionThreshold: 0.01
voiceDetectionDelayMs: 500
unityMicrophoneDevice: Microphone Array (4- Synaptics Audio)
unityMicrophoneDevice: Headset Microphone (HyperX Virtual Surround Sound)
photonMicrophoneDeviceId: 0
interestGroup: 0
debugEchoMode: 0
Expand Down Expand Up @@ -249,9 +249,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1cd365756b121f7469982d215f0fc530, type: 3}
m_Name:
m_EditorClassIdentifier:
barChartVisualizationPrefab: {fileID: 2854458270353734934, guid: d14576bb6f2c5834b972dc8273a01c56,
barChartVisualizationPrefab: {fileID: 2854458270353734934, guid: d0cccdac0779f304e87dd50eacc43efa,
type: 3}
pollShelfPrefab: {fileID: 5049388039812408638, guid: b1e0914af998f914497c205577287c7c,
type: 3}
barDistance: 2
shelfDistance: 3
pollSerializerPrefab: {fileID: 4029607018951597712, guid: ec614f62db8d9fe4f81202b4865fcfe8,
type: 3}
savedPolls: []
--- !u!1 &1584635095594973785
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading