aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDmitry Duka <[email protected]>2017-10-31 14:34:10 +0300
committerDmitry Duka <[email protected]>2017-10-31 14:34:10 +0300
commit4bc8034acac37e8493a5d166d9573543da149f94 (patch)
tree41059b185be6a1d65b13cc2240055fee26a17205 /include
parentUpdating Ansel SDK to the latest revision (diff)
downloadanselsdk-4bc8034acac37e8493a5d166d9573543da149f94.tar.xz
anselsdk-4bc8034acac37e8493a5d166d9573543da149f94.zip
Updating Ansel SDK to v1.5v1.5.371
Diffstat (limited to 'include')
-rw-r--r--include/ansel/Camera.h4
-rw-r--r--include/ansel/Defines.h7
-rw-r--r--include/ansel/Hints.h1
-rw-r--r--include/ansel/UserControls.h20
-rw-r--r--include/ansel/Version.h8
5 files changed, 34 insertions, 6 deletions
diff --git a/include/ansel/Camera.h b/include/ansel/Camera.h
index 5741af2..130a742 100644
--- a/include/ansel/Camera.h
+++ b/include/ansel/Camera.h
@@ -47,6 +47,10 @@ namespace ansel
// applied directly as translations to the projection matrix. These values are only
// non-zero during Highres capture.
float projectionOffsetX, projectionOffsetY;
+ // Values of the near and far planes
+ float nearPlane, farPlane;
+ // Projection matrix aspect ratio
+ float aspectRatio;
};
// Must be called on every frame an Ansel session is active. The 'camera' must contain
diff --git a/include/ansel/Defines.h b/include/ansel/Defines.h
index a591287..e1ad47d 100644
--- a/include/ansel/Defines.h
+++ b/include/ansel/Defines.h
@@ -28,12 +28,15 @@
#pragma once
#ifdef ANSEL_SDK_EXPORTS
- #define ANSEL_SDK_API extern "C" __declspec(dllexport)
+ #define ANSEL_SDK_API __declspec(dllexport)
+ #define ANSEL_SDK_INTERNAL_API extern "C" __declspec(dllexport)
#define ANSEL_SDK_CLASS_API __declspec(dllexport)
#elif !defined(ANSEL_SDK_DELAYLOAD)
- #define ANSEL_SDK_API extern "C" __declspec(dllimport)
+ #define ANSEL_SDK_API __declspec(dllimport)
+ #define ANSEL_SDK_INTERNAL_API extern "C" __declspec(dllimport)
#define ANSEL_SDK_CLASS_API __declspec(dllimport)
#else
#define ANSEL_SDK_API
+ #define ANSEL_SDK_INTERNAL_API
#define ANSEL_SDK_CLASS_API
#endif
diff --git a/include/ansel/Hints.h b/include/ansel/Hints.h
index 961cb11..0ab298b 100644
--- a/include/ansel/Hints.h
+++ b/include/ansel/Hints.h
@@ -36,6 +36,7 @@ namespace ansel
kBufferTypeHDR = 0,
kBufferTypeDepth,
kBufferTypeHUDless,
+ kBufferTypePresentable,
kBufferTypeCount
};
diff --git a/include/ansel/UserControls.h b/include/ansel/UserControls.h
index a19f0d5..daca6d3 100644
--- a/include/ansel/UserControls.h
+++ b/include/ansel/UserControls.h
@@ -64,9 +64,23 @@ namespace ansel
//
struct UserControlInfo
{
+ // Any ID user wants
uint32_t userControlId;
+ // A type of the user control (slider, boolean)
UserControlType userControlType;
+ // A value - boolean or float, depending on the control type
+ // Needs to be casted to the apropriate type and dereferenced
const void* value;
+ // User defined pointer which is then passed to all the callbacks (nullptr by default)
+ void* userPointer;
+
+ UserControlInfo()
+ {
+ userControlId = 0;
+ userControlType = UserControlType::kUserControlBoolean;
+ value = nullptr;
+ userPointer = nullptr;
+ }
};
typedef void(*UserControlCallback)(const UserControlInfo& info);
@@ -81,6 +95,12 @@ namespace ansel
const char* labelUtf8;
UserControlCallback callback;
UserControlInfo info;
+
+ UserControlDesc()
+ {
+ labelUtf8 = nullptr;
+ callback = nullptr;
+ }
};
// This function adds a user control defined with the UserControlDesc object
diff --git a/include/ansel/Version.h b/include/ansel/Version.h
index ea3b9a5..738ff05 100644
--- a/include/ansel/Version.h
+++ b/include/ansel/Version.h
@@ -38,15 +38,15 @@
// MINIMUM_DRIVER_VERSION as well. While a public driver hasn't been finalized use our internal
// release tags to identify it (like 378.GA2).
#define ANSEL_SDK_PRODUCT_VERSION_MAJOR 1
-#define ANSEL_SDK_PRODUCT_VERSION_MINOR 4
-#define ANSEL_SDK_MINIMUM_DRIVER_VERSION "384.76"
+#define ANSEL_SDK_PRODUCT_VERSION_MINOR 5
+#define ANSEL_SDK_MINIMUM_DRIVER_VERSION "388.13"
// The lines below are automatically updated by build agents. Please don't touch.
// The BUILD_NUMBER and COMMIT_HASH are useful in uniquely identifying a build of the Ansel SDK.
// Changes to the customer facing API can be tracked with these since they are automatically
// updated every time a change is made.
-#define ANSEL_SDK_BUILD_NUMBER 339
-#define ANSEL_SDK_COMMIT_HASH 0x212e90ca
+#define ANSEL_SDK_BUILD_NUMBER 371
+#define ANSEL_SDK_COMMIT_HASH 0x6b5f6534
#define ANSEL_SDK_VERSION ( uint64_t(ANSEL_SDK_PRODUCT_VERSION_MAJOR) << 48 | uint64_t(ANSEL_SDK_PRODUCT_VERSION_MINOR) << 32 \
| ANSEL_SDK_COMMIT_HASH )