稻草人吃软饭染发

.gitignore

@@ -0,0 +1 @@
+compile-error.txt

.gitmodules

@@ -0,0 +1,10 @@
+[submodule "sksevr_plugin/skse"]
+	path = sksevr_plugin/skse
+	url = [email protected]:Odie/sksevr-mirror.git
+[submodule "sksevr_plugin/common"]
+	path = sksevr_plugin/common
+	url = [email protected]:Odie/sksevr-common-mirror.git
+[submodule "sksevr_plugin/luajit"]
+	path = sksevr_plugin/luajit
+	url = https://luajit.org/git/luajit.git
+	ignore = dirty

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2012 schlangster
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,12 +1,48 @@
-Related repositories
+SkyUI - VR
+----------
+
+This repository hosts the source and the packaged releases for a working
+version of SkyUI (and MCM) for SkyrimVR.
+
+### Getting SkyUI
+
+To get the mod, head on over to 
+[the release page](https://github.com/Odie/skyui-vr/releases/) and grab the
+lastest version. All you need is the .7z file. (Ignore the source code download
+links.)
+
+### Prerequsite
+Make sure [SKSE VR](http://skse.silverlock.org/) is installed. (Don't forget
+the .pex files!)
+
+### Installation
+
+For MO2 users, use the "Install from file" icon in the toolbar.
+
+For Vortex users, drop the .7z file over the vortex window.
+
+
+VR specific controls
 --------------------
-### Unofficial UI SDK
-https://github.com/Mardoxx/skyrimui
 
-Disclaimer
-----------
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Currently, there are certain limitations to how the UIs in the game can process
+inputs from the VR controllers. At the moment, the UI seems to mostly receive
+up/down/right/left signals from the game. This makes operating a more complex
+UI like SkyUI a little difficult, but not impossible.
+
+Here's what you need to know.
+
+### Toggle trade direction
+In the barter menu or the gift menu, keep hitting "left" until you've reached
+the first item on the category list (titled "All"). Hit "left" again and the 
+trade direction should toggle.
 
-Thanks to MIT license for providing this standard disclaimer.
+### Sorting items
+This applies to any screen where you can see an inventory list. With the first 
+item in the list selected (or nothing selected), hit "up" once to move the 
+sorted column to the next one. Hit "up" twice in quick succession to change the 
+sort direction.
 
-Thanks to Bethesda Game Studios for creating The Elder Scrolls V: Skyrim, providing the base content and allowing us to mod it.
+For trackpad users, trying using "slow swipe" and "fast swipe" to differentiate 
+between these two actions. The number of controller vibrations indicates how many 
+"up" events the game has registered.

build/skyui/config.txt

@@ -27,13 +27,13 @@ itemcard.yOffset = 0
 
 
 ; =====================================================================================================================
-[ItemList] 
+[ItemList]
 ; =====================================================================================================================
 quantityMenu.minCount = 6 ; Number of items required to trigger quantity dialog. 0 is disabled
 
 
 ; =====================================================================================================================
-[Appearance] 
+[Appearance]
 ; =====================================================================================================================
 icons.category.source = 'skyui/icons_category_psychosteve.swf'
 
@@ -50,7 +50,7 @@ colors.negative.disabled = 0x800000
 
 
 ; =====================================================================================================================
-[ListLayout] 
+[ListLayout]
 ; =====================================================================================================================
 vars.a_textBorder.value = <0, 0, 1.1, 0> ; left right top bottom
 vars.n_iconSize.value = 18
@@ -63,7 +63,7 @@ defaults.entry.textFormat.align = right
 defaults.entry.textFormat.bold = false
 defaults.entry.textFormat.italic = false
 defaults.entry.textFormat.underline = false
-defaults.entry.textFormat.size = 14
+defaults.entry.textFormat.size = 18
 defaults.entry.textFormat.letterSpacing = 0.8
 defaults.entry.textFormat.kerning = false
 defaults.entry.textFormat.leftMargin = 0
@@ -76,7 +76,7 @@ defaults.label.textFormat.align = right
 defaults.label.textFormat.bold = false
 defaults.label.textFormat.italic = false
 defaults.label.textFormat.underline = false
-defaults.label.textFormat.size = 12
+defaults.label.textFormat.size = 16
 defaults.label.textFormat.letterSpacing = 0.8
 defaults.label.textFormat.kerning = false
 defaults.label.textFormat.leftMargin = 0
@@ -757,4 +757,4 @@ layouts.smithingListLayout.name = 'SmithingListLayout'
 layouts.smithingListLayout.views = <defaultCraftingView>
 
 layouts.alchemyListLayout.name = 'AlchemyListLayout'
-layouts.alchemyListLayout.views = <alchemyView>
+layouts.alchemyListLayout.views = <alchemyView>

dist/Data/Interface/skyui/config.txt

@@ -118,23 +118,24 @@ columns.itemNameColumn.label.textFormat.align = left
 
 columns.itemNameColumn.state1.label.text = '$NAME'
 columns.itemNameColumn.state1.entry.text = @text
+columns.itemNameColumn.state1.sortAttributes = <newItem, text>
 columns.itemNameColumn.state1.sortOptions = {ASCENDING | CASEINSENSITIVE}
 
 columns.itemNameColumn.state2.label.text = '$EQUIPPED'
 columns.itemNameColumn.state2.entry.text = @text
-columns.itemNameColumn.state2.sortAttributes = <isEquipped, equipState, text>
+columns.itemNameColumn.state2.sortAttributes = <newItem, isEquipped, equipState, text>
 columns.itemNameColumn.state2.sortOptions = <{DESCENDING | NUMERIC}, {DESCENDING | NUMERIC}, {ASCENDING | CASEINSENSITIVE}>
 columns.itemNameColumn.state2.playerOnly = true
 
 columns.itemNameColumn.state3.label.text = '$STOLEN'
 columns.itemNameColumn.state3.entry.text = @text
-columns.itemNameColumn.state3.sortAttributes = <isStolen, text>
+columns.itemNameColumn.state3.sortAttributes = <newItem, isStolen, text>
 columns.itemNameColumn.state3.sortOptions = <{DESCENDING | NUMERIC}, {ASCENDING | CASEINSENSITIVE}>
 columns.itemNameColumn.state3.playerOnly = true
 
 columns.itemNameColumn.state4.label.text = '$ENCHANTED'
 columns.itemNameColumn.state4.entry.text = @text
-columns.itemNameColumn.state4.sortAttributes = <isEnchanted, text>
+columns.itemNameColumn.state4.sortAttributes = <newItem, isEnchanted, text>
 columns.itemNameColumn.state4.sortOptions = <{DESCENDING | NUMERIC}, {ASCENDING | CASEINSENSITIVE}>
 
 

dist/Data/Scripts/Source/SKI_ConfigBase.psc

@@ -10,6 +10,7 @@ int property		STATE_RESET		= 1 autoReadonly
 int property		STATE_SLIDER	= 2 autoReadonly
 int property		STATE_MENU		= 3 autoReadonly
 int property		STATE_COLOR		= 4 autoReadonly
+int property		STATE_INPUT		= 5 autoReadonly
 
 int property		OPTION_TYPE_EMPTY	= 0x00 autoReadonly
 int property		OPTION_TYPE_HEADER	= 0x01 autoReadonly
@@ -19,6 +20,7 @@ int property 		OPTION_TYPE_SLIDER	= 0x04 autoReadonly
 int property		OPTION_TYPE_MENU	= 0x05 autoReadonly
 int property		OPTION_TYPE_COLOR	= 0x06 autoReadonly
 int property		OPTION_TYPE_KEYMAP	= 0x07 autoReadonly
+int property		OPTION_TYPE_INPUT	= 0x08 autoReadonly
 
 int property		OPTION_FLAG_NONE		= 0x00 autoReadonly
 int property		OPTION_FLAG_DISABLED	= 0x01 autoReadonly
@@ -56,6 +58,7 @@ int[]				_colorParams
 int					_activeOption		= -1
 
 string				_infoText
+string				_inputStartText
 
 bool				_messageResult		= false
 bool				_waitForMessage		= false
@@ -741,7 +744,7 @@ bool function ShowMessage(string a_message, bool a_withCancel = true, string a_a
 	endWhile
 
 	UnregisterForModEvent("SKICP_messageDialogClosed")
-	
+
 	return _messageResult
 endFunction
 
@@ -765,7 +768,7 @@ function OpenConfig()
 endFunction
 
 function CloseConfig()
-	OnConfigClose()	
+	OnConfigClose()
 	ClearOptionBuffers()
 	_waitForMessage = false
 
@@ -780,14 +783,14 @@ endFunction
 function SetPage(string a_page, int a_index)
 	_currentPage = a_page
 	_currentPageNum = 1+a_index
-	
+
 	; Set default title, can be overridden in OnPageReset
 	if (a_page != "")
 		SetTitleText(a_page)
 	else
 		SetTitleText(ModName)
 	endIf
-	
+
 	ClearOptionBuffers()
 	_state = STATE_RESET
 	OnPageReset(a_page)
@@ -805,18 +808,18 @@ int function AddOption(int a_optionType, string a_text, string a_strValue, float
 	if (pos == -1)
 		return -1 ; invalid
 	endIf
-	
+
 	_optionFlagsBuf[pos] = a_optionType + a_flags * 0x100
 	_textBuf[pos] = a_text
 	_strValueBuf[pos] = a_strValue
 	_numValueBuf[pos] = a_numValue
-	
+
 	; Just use numerical value of fill mode
 	_cursorPosition += _cursorFillMode
 	if (_cursorPosition >= 128)
 		_cursorPosition = -1
 	endIf
-	
+
 	; byte 1 - position
 	; byte 2 - page
 	return pos + _currentPageNum * 0x100
@@ -827,7 +830,7 @@ function AddOptionST(string a_stateName, int a_optionType, string a_text, string
 		Error("State option name " + a_stateName + " is already in use")
 		return
 	endIf
-	
+
 	int index = AddOption(a_optionType, a_text, a_strValue, a_numValue, a_flags) % 0x100
 	if (index < 0)
 		return
@@ -868,7 +871,7 @@ function WriteOptionBuffers()
 		endif
 		i += 1
 	endWhile
-	
+
 	UI.InvokeIntA(menu, root + ".setOptionFlagsBuffer", _optionFlagsBuf)
 	UI.InvokeStringA(menu, root + ".setOptionTextBuffer", _textBuf)
 	UI.InvokeStringA(menu, root + ".setOptionStrValueBuffer", _strValueBuf)
@@ -1114,3 +1117,89 @@ function RemapKey(int a_index, int a_keyCode, string a_conflictControl, string a
 		OnOptionKeyMapChange(option, a_keyCode, a_conflictControl, a_conflictName)
 	endIf
 endFunction
+
+function OnOptionInputOpen(Int a_option)
+{Called when a text input option has been selected}
+endFunction
+
+function OnInputOpenST()
+{Called when a text input state option has been selected}
+endFunction
+
+function OnOptionInputAccept(Int a_option, String a_input)
+{Called when a new text input has been accepted}
+endFunction
+
+function OnInputAcceptST(String a_input)
+{Called when a new text input has been accepted for this state option}
+endFunction
+
+function SetInputOptionValue(Int a_option, String a_value, Bool a_noUpdate)
+	Int index = a_option % 256
+	Int type = _optionFlagsBuf[index] % 256
+	if type != self.OPTION_TYPE_INPUT
+		Int pageIdx = a_option / 256 - 1
+		if pageIdx != -1
+			self.Error("Option type mismatch. Expected input option, page \"" + Pages[pageIdx] + "\", index " + index as String)
+		else
+			self.Error("Option type mismatch. Expected input option, page \"\", index " + index as String)
+		endIf
+		return
+	endIf
+	self.SetOptionStrValue(index, a_value, a_noUpdate)
+endFunction
+
+function SetInputOptionValueST(String a_value, Bool a_noUpdate, String a_stateName)
+	Int index = self.GetStateOptionIndex(a_stateName)
+	if index < 0
+		self.Error("Cannot use SetInputOptionValueST outside a valid option state")
+		return
+	endIf
+	self.SetInputOptionValue(index, a_value, a_noUpdate)
+endFunction
+
+function RequestInputDialogData(Int a_index)
+	_activeOption = a_index + _currentPageNum * 256
+	_inputStartText = ""
+	_state = self.STATE_INPUT
+	String optionState = _stateOptionMap[a_index]
+	if optionState != ""
+		String oldState = self.GetState()
+		self.GotoState(optionState)
+		self.OnInputOpenST()
+		self.GotoState(oldState)
+	else
+		self.OnOptionInputOpen(_activeOption)
+	endIf
+	_state = self.STATE_DEFAULT
+	ui.InvokeString(self.JOURNAL_MENU, self.MENU_ROOT + ".setInputDialogParams", _inputStartText)
+endFunction
+
+Int function AddInputOption(String a_text, String a_value, Int a_flags)
+	return self.AddOption(self.OPTION_TYPE_INPUT, a_text, a_value, 0 as Float, a_flags)
+endFunction
+
+function AddInputOptionST(String a_stateName, String a_text, String a_value, Int a_flags)
+	self.AddOptionST(a_stateName, self.OPTION_TYPE_INPUT, a_text, a_value, 0 as Float, a_flags)
+endFunction
+
+function SetInputDialogStartText(String a_text)
+	if _state != self.STATE_INPUT
+		self.Error("Cannot set input dialog params while outside OnOptionInputOpen()")
+		return
+	endIf
+	_inputStartText = a_text
+endFunction
+
+function SetInputText(String a_text)
+	String optionState = _stateOptionMap[_activeOption % 256]
+	if optionState != ""
+		String oldState = self.GetState()
+		self.GotoState(optionState)
+		self.OnInputAcceptST(a_text)
+		self.GotoState(oldState)
+	else
+		self.OnOptionInputAccept(_activeOption, a_text)
+	endIf
+	_activeOption = -1
+endFunction

dist/Data/Scripts/Source/SKI_ConfigManager.psc

@@ -70,6 +70,8 @@ event OnGameReload()
 	RegisterForModEvent("SKICP_menuAccepted", "OnMenuAccept")
 	RegisterForModEvent("SKICP_colorSelected", "OnColorSelect")
 	RegisterForModEvent("SKICP_colorAccepted", "OnColorAccept")
+	self.RegisterForModEvent("SKICP_inputSelected", "OnInputSelect")
+	self.RegisterForModEvent("SKICP_inputAccepted", "OnInputAccept")
 	RegisterForModEvent("SKICP_dialogCanceled", "OnDialogCancel")
 
 	RegisterForMenu(JOURNAL_MENU)
@@ -357,6 +359,15 @@ function Log(string a_msg)
 	Debug.Trace(self + ": " + a_msg)
 endFunction
 
+function OnInputSelect(String a_eventName, String a_strArg, Float a_numArg, Form a_sender)
+	Int optionIndex = a_numArg as Int
+	_activeConfig.RequestInputDialogData(optionIndex)
+endFunction
+
+function OnInputAccept(String a_eventName, String a_strArg, Float a_numArg, Form a_sender)
+	_activeConfig.SetInputText(a_strArg)
+	ui.InvokeBool(self.JOURNAL_MENU, self.MENU_ROOT + ".unlock", true)
+endFunction
 
 ; STATES ---------------------------------------------------------------------------------------