Skip to content

Commit

Permalink
- fixed empty string
Browse files Browse the repository at this point in the history
- shortened getFieldOrder()
  • Loading branch information
elect86 committed Feb 21, 2018
1 parent 41552f5 commit 49ea0ff
Show file tree
Hide file tree
Showing 16 changed files with 102 additions and 102 deletions.
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ open class IVRApplications : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("AddApplicationManifest", "RemoveApplicationManifest", "IsApplicationInstalled", "GetApplicationCount",
override fun getFieldOrder() = listOf("AddApplicationManifest", "RemoveApplicationManifest", "IsApplicationInstalled", "GetApplicationCount",
"GetApplicationKeyByIndex", "GetApplicationKeyByProcessId", "LaunchApplication", "LaunchTemplateApplication", "LaunchApplicationFromMimeType",
"LaunchDashboardOverlay", "CancelApplicationLaunch", "IdentifyApplication", "GetApplicationProcessId", "GetApplicationsErrorNameFromEnum",
"GetApplicationPropertyString", "GetApplicationPropertyBool", "GetApplicationPropertyUint64", "SetApplicationAutoLaunch", "GetApplicationAutoLaunch",
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrChaperone.kt
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ open class IVRChaperone : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("GetCalibrationState", "GetPlayAreaSize", "GetPlayAreaRect", "ReloadInfo", "SetSceneColor",
override fun getFieldOrder() = listOf("GetCalibrationState", "GetPlayAreaSize", "GetPlayAreaRect", "ReloadInfo", "SetSceneColor",
"GetBoundsColor", "AreBoundsVisible_callback", "ForceBoundsVisible")

constructor(peer: Pointer) : super(peer) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrChaperoneSetup.kt
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ open class IVRChaperoneSetup : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("CommitWorkingCopy", "RevertWorkingCopy", "GetWorkingPlayAreaSize", "GetWorkingPlayAreaRect",
override fun getFieldOrder() = listOf("CommitWorkingCopy", "RevertWorkingCopy", "GetWorkingPlayAreaSize", "GetWorkingPlayAreaRect",
"GetWorkingCollisionBoundsInfo", "GetLiveCollisionBoundsInfo", "GetWorkingSeatedZeroPoseToRawTrackingPose",
"GetWorkingStandingZeroPoseToRawTrackingPose", "SetWorkingPlayAreaSize", "SetWorkingCollisionBoundsInfo", "SetWorkingSeatedZeroPoseToRawTrackingPose",
"SetWorkingStandingZeroPoseToRawTrackingPose", "ReloadFromDisk", "GetLiveSeatedZeroPoseToRawTrackingPose", "SetWorkingCollisionBoundsTagsInfo",
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/openvr/lib/ivrCompositor.kt
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ open class Compositor_FrameTiming : Structure {
this.hmdPose = hmdPose
}

override fun getFieldOrder(): List<String> = Arrays.asList("size", "frameIndex", "numFramePresents", "numMisPresented",
override fun getFieldOrder() = listOf("size", "frameIndex", "numFramePresents", "numMisPresented",
"numDroppedFrames", "reprojectionFlags", "systemTimeInSeconds", "preSubmitGpuMs", "postSubmitGpuMs",
"totalRenderGpuMs", "compositorRenderGpuMs", "compositorRenderCpuMs", "compositorIdleCpuMs",
"clientFrameIntervalMs", "presentCallCpuMs", "waitForPresentCpuMs", "submitFrameMs",
Expand Down Expand Up @@ -272,7 +272,7 @@ open class Compositor_CumulativeStats : Structure {
this.numReprojectedFramesTimedOut = numReprojectedFramesTimedOut
}

override fun getFieldOrder(): List<String> = Arrays.asList("pid", "numFramePresents", "numDroppedFrames",
override fun getFieldOrder()= listOf("pid", "numFramePresents", "numDroppedFrames",
"numReprojectedFrames", "numFramePresentsOnStartup", "numDroppedFramesOnStartup",
"numReprojectedFramesOnStartup", "numLoading", "numFramePresentsLoading", "numDroppedFramesLoading",
"numReprojectedFramesLoading", "numTimedOut", "numFramePresentsTimedOut", "numDroppedFramesTimedOut",
Expand Down Expand Up @@ -794,7 +794,7 @@ open class IVRCompositor : Structure {

constructor()

override fun getFieldOrder(): List<String> = listOf("SetTrackingSpace", "GetTrackingSpace", "WaitGetPoses", "GetLastPoses",
override fun getFieldOrder()= listOf("SetTrackingSpace", "GetTrackingSpace", "WaitGetPoses", "GetLastPoses",
"GetLastPoseForTrackedDeviceIndex", "Submit", "ClearLastSubmittedFrame", "PostPresentHandoff", "GetFrameTiming",
"GetFrameTimings", "GetFrameTimeRemaining", "GetCumulativeStats", "FadeToColor", "GetCurrentFadeColor", "FadeGrid",
"GetCurrentGridAlpha", "SetSkyboxOverride", "ClearSkyboxOverride", "CompositorBringToFront", "CompositorGoToBack",
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrDriverManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ open class IVRDriverManager : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("GetDriverCount", "GetDriverName", "GetDriverHandle")
override fun getFieldOrder()= listOf("GetDriverCount", "GetDriverName", "GetDriverHandle")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrExtendedDisplay.kt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ open class IVRExtendedDisplay : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("GetWindowBounds", "GetEyeOutputViewport", "GetDXGIOutputInfo")
override fun getFieldOrder()= listOf("GetWindowBounds", "GetEyeOutputViewport", "GetDXGIOutputInfo")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/openvr/lib/ivrNotifications.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ open class NotificationBitmap : Structure {
this.bytesPerPixel = bytesPerPixel
}

override fun getFieldOrder(): List<String> = Arrays.asList("imageData", "width", "height", "bytesPerPixel")
override fun getFieldOrder()= listOf("imageData", "width", "height", "bytesPerPixel")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -115,7 +115,7 @@ open class IVRNotifications : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("CreateNotification", "RemoveNotification")
override fun getFieldOrder()= listOf("CreateNotification", "RemoveNotification")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down
12 changes: 6 additions & 6 deletions src/main/kotlin/openvr/lib/ivrOverlay.kt
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ open class VROverlayIntersectionParams : Structure {
this.eOrigin = origin.i
}

override fun getFieldOrder(): List<String> = Arrays.asList("source", "direction", "eOrigin")
override fun getFieldOrder()= listOf("source", "direction", "eOrigin")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -180,7 +180,7 @@ open class VROverlayIntersectionResults : Structure {
this.distance = distance
}

override fun getFieldOrder(): List<String> = Arrays.asList("point", "normal", "uv", "distance")
override fun getFieldOrder()= listOf("point", "normal", "uv", "distance")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -258,7 +258,7 @@ open class IntersectionMaskRectangle : Structure {
this.height = height
}

override fun getFieldOrder(): List<String> = Arrays.asList("topLeftX", "topLeftY", "width", "height")
override fun getFieldOrder()= listOf("topLeftX", "topLeftY", "width", "height")

constructor(peer: Pointer) : super(peer) {
read()
Expand All @@ -285,7 +285,7 @@ open class IntersectionMaskCircle : Structure {
this.radius = radius
}

override fun getFieldOrder(): List<String> = Arrays.asList("centerX", "centerY", "radius")
override fun getFieldOrder()= listOf("centerX", "centerY", "radius")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -321,7 +321,7 @@ open class VROverlayIntersectionMaskPrimitive : Structure {
this.primitive = m_Primitive
}

override fun getFieldOrder(): List<String> = Arrays.asList("primitiveType", "primitive")
override fun getFieldOrder()= listOf("primitiveType", "primitive")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -1269,7 +1269,7 @@ open class IVROverlay : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("FindOverlay", "CreateOverlay", "DestroyOverlay",
override fun getFieldOrder()= listOf("FindOverlay", "CreateOverlay", "DestroyOverlay",
"SetHighQualityOverlay", "GetHighQualityOverlay", "GetOverlayKey", "GetOverlayName", "SetOverlayName",
"GetOverlayImageData", "GetOverlayErrorNameFromEnum", "SetOverlayRenderingPid", "GetOverlayRenderingPid", "SetOverlayFlag",
"GetOverlayFlag", "SetOverlayColor", "GetOverlayColor", "SetOverlayAlpha", "GetOverlayAlpha", "SetOverlayTexelAspect",
Expand Down
12 changes: 6 additions & 6 deletions src/main/kotlin/openvr/lib/ivrRenderModels.kt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ open class RenderModel_ComponentState : Structure {
this.properties = properties
}

override fun getFieldOrder(): List<String> = Arrays.asList("trackingToComponentRenderModel", "trackingToComponentLocal", "properties")
override fun getFieldOrder()= listOf("trackingToComponentRenderModel", "trackingToComponentLocal", "properties")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -121,7 +121,7 @@ open class RenderModel_Vertex : Structure {
this.textureCoord = textureCoord
}

override fun getFieldOrder(): List<String> = Arrays.asList("position", "normal", "textureCoord")
override fun getFieldOrder()= listOf("position", "normal", "textureCoord")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -167,7 +167,7 @@ open class RenderModel_TextureMap : Structure {
this.rubTextureMapData = rubTextureMapData
}

override fun getFieldOrder(): List<String> = Arrays.asList("width", "height", "rubTextureMapData")
override fun getFieldOrder()= listOf("width", "height", "rubTextureMapData")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -224,7 +224,7 @@ open class RenderModel : Structure {
this.diffuseTextureId = diffuseTextureId
}

override fun getFieldOrder(): List<String> = Arrays.asList("rVertexData", "vertexCount", "rIndexData",
override fun getFieldOrder()= listOf("rVertexData", "vertexCount", "rIndexData",
"triangleCount", "diffuseTextureId")

constructor(peer: Pointer) : super(peer) {
Expand Down Expand Up @@ -257,7 +257,7 @@ open class RenderModel_ControllerMode_State : Structure {
this.bScrollWheelVisible = if (bScrollWheelVisible) 1.b else 0.b
}

override fun getFieldOrder(): List<String> = Arrays.asList("bScrollWheelVisible")
override fun getFieldOrder()= listOf("bScrollWheelVisible")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down Expand Up @@ -501,7 +501,7 @@ open class IVRRenderModels : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("LoadRenderModel_Async", "FreeRenderModel", "LoadTexture_Async", "FreeTexture",
override fun getFieldOrder()= listOf("LoadRenderModel_Async", "FreeRenderModel", "LoadTexture_Async", "FreeTexture",
"LoadTextureD3D11_Async", "LoadIntoTextureD3D11_Async", "FreeTextureD3D11", "GetRenderModelName", "GetRenderModelCount", "GetComponentCount",
"GetComponentName", "GetComponentButtonMask", "GetComponentRenderModelName", "GetComponentState", "RenderModelHasComponent",
"GetRenderModelThumbnailURL", "GetRenderModelOriginalPath", "GetRenderModelErrorNameFromEnum")
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrResources.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ open class IVRResources : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("LoadSharedResource", "GetResourceFullPath")
override fun getFieldOrder()= listOf("LoadSharedResource", "GetResourceFullPath")

constructor(peer: Pointer) : super(peer) {
read()
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrScreenshots.kt
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ open class IVRScreenshots : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("RequestScreenshot", "HookScreenshot", "GetScreenshotPropertyType", "GetScreenshotPropertyFilename",
override fun getFieldOrder()= listOf("RequestScreenshot", "HookScreenshot", "GetScreenshotPropertyType", "GetScreenshotPropertyFilename",
"UpdateScreenshotProgress", "TakeStereoScreenshot", "SubmitScreenshot")

constructor(peer: Pointer) : super(peer) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrSettings.kt
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ open class IVRSettings : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("GetSettingsErrorNameFromEnum", "Sync", "SetBool", "SetInt32",
override fun getFieldOrder()= listOf("GetSettingsErrorNameFromEnum", "Sync", "SetBool", "SetInt32",
"SetFloat", "SetString", "GetBool", "GetInt32", "GetFloat", "GetString", "RemoveSection", "RemoveKeyInSection")

constructor(peer: Pointer) : super(peer) {
Expand Down
14 changes: 7 additions & 7 deletions src/main/kotlin/openvr/lib/ivrSystem.kt
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ open class IVRSystem : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("GetRecommendedRenderTargetSize", "GetProjectionMatrix",
override fun getFieldOrder()= listOf("GetRecommendedRenderTargetSize", "GetProjectionMatrix",
"GetProjectionRaw", "ComputeDistortion", "GetEyeToHeadTransform", "GetTimeSinceLastVsync", "GetD3D9AdapterIndex",
"GetDXGIOutputInfo", "GetOutputDevice", "IsDisplayOnDesktop", "SetDisplayVisibility", "GetDeviceToAbsoluteTrackingPose",
"ResetSeatedZeroPose", "GetSeatedZeroPoseToStandingAbsoluteTrackingPose", "GetRawZeroPoseToStandingAbsoluteTrackingPose",
Expand Down Expand Up @@ -814,22 +814,22 @@ fun Int.toEVRApplicationTransitionState() = EVRApplicationTransitionState.values
open class AppOverrideKeys : Structure {

@JvmField
var pchKey = "" // TODO check
var key = "" // TODO check
@JvmField
var pchValue = ""
var value = ""

constructor()

constructor(pchKey: String, pchValue: String) {
this.pchKey = pchKey
this.pchValue = pchValue
constructor(key: String, value: String) {
this.key = key
this.value = value
}

constructor(peer: Pointer) : super(peer) {
read()
}

override fun getFieldOrder(): List<String> = Arrays.asList("pchKey", "pchValue")
override fun getFieldOrder()= listOf("key", "value")

class ByReference : AppOverrideKeys(), Structure.ByReference
class ByValue : AppOverrideKeys(), Structure.ByValue
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/openvr/lib/ivrTrackedCamera.kt
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ open class IVRTrackedCamera : Structure {

constructor()

override fun getFieldOrder(): List<String> = Arrays.asList("GetCameraErrorNameFromEnum", "HasCamera", "GetCameraFrameSize",
override fun getFieldOrder()= listOf("GetCameraErrorNameFromEnum", "HasCamera", "GetCameraFrameSize",
"GetCameraIntrinsics", "GetCameraProjection", "AcquireVideoStreamingService", "ReleaseVideoStreamingService",
"GetVideoStreamFrameBuffer", "GetVideoStreamTextureSize", "GetVideoStreamTextureD3D11", "GetVideoStreamTextureGL",
"ReleaseVideoStreamTextureGL")
Expand Down
Loading

0 comments on commit 49ea0ff

Please sign in to comment.