- Removing unnecessary selectPressedAmount related code from basic BrushController script. (selectPressedAmount is used in Advanced only, in BrushSelector script)
- Deleting unnecessary meta files that generates missing error messages.
This commit is contained in:
Родитель
7e0c1ca416
Коммит
beb1ca8dba
|
@ -56,6 +56,8 @@ namespace HoloToolkit.Unity.ControllerExamples
|
|||
private ColorPickerWheel colorPicker;
|
||||
private Color currentStrokeColor = Color.white;
|
||||
private bool draw = false;
|
||||
|
||||
// Default storke width is defined in BrushThinStroke.prefab
|
||||
private float width = 0f;
|
||||
private float lastPointAddedTime = 0f;
|
||||
|
||||
|
@ -64,14 +66,12 @@ namespace HoloToolkit.Unity.ControllerExamples
|
|||
// Subscribe to press events for drawing
|
||||
InteractionManager.InteractionSourcePressed += InteractionSourcePressed;
|
||||
InteractionManager.InteractionSourceReleased += InteractionSourceReleased;
|
||||
InteractionManager.InteractionSourceUpdated += InteractionSourceUpdated;
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
InteractionManager.InteractionSourcePressed -= InteractionSourcePressed;
|
||||
InteractionManager.InteractionSourceReleased -= InteractionSourceReleased;
|
||||
InteractionManager.InteractionSourceUpdated -= InteractionSourceUpdated;
|
||||
}
|
||||
|
||||
private void Update()
|
||||
|
@ -93,14 +93,6 @@ namespace HoloToolkit.Unity.ControllerExamples
|
|||
}
|
||||
}
|
||||
|
||||
private void InteractionSourceUpdated(InteractionSourceUpdatedEventArgs obj)
|
||||
{
|
||||
if (obj.state.source.handedness == InteractionSourceHandedness.Right)
|
||||
{
|
||||
width = obj.state.selectPressedAmount;
|
||||
}
|
||||
}
|
||||
|
||||
private void InteractionSourceReleased(InteractionSourceReleasedEventArgs obj)
|
||||
{
|
||||
if (obj.state.source.handedness == InteractionSourceHandedness.Right && obj.pressType == InteractionSourcePressType.Select)
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4f106707aefa5e44591b0c72cab2b44a
|
||||
timeCreated: 1481757313
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c54c43fae64ba1845a3579779818700a
|
||||
timeCreated: 1481757313
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 586bf14c7c7de5b418595eec11505982
|
||||
timeCreated: 1481762238
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c7b57dac0ac191541831c7398a7226e8
|
||||
timeCreated: 1481762238
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2ffba62fc49d82b4fb482673e4a6a03a
|
||||
timeCreated: 1488424603
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1a995452991a07b4080c6e0749d0ecb2
|
||||
timeCreated: 1495737220
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ba5d0cb6a39b4a84797f85bdc712d35d
|
||||
timeCreated: 1495737382
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 988367d1bf658ff46b8634cea1906dfa
|
||||
timeCreated: 1495737290
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Загрузка…
Ссылка в новой задаче