aboutsummaryrefslogtreecommitdiff
path: root/include/ansel
diff options
context:
space:
mode:
authorDmitry Duka <[email protected]>2017-03-09 18:32:42 +0300
committerDmitry Duka <[email protected]>2017-03-09 18:32:42 +0300
commit3f2d7c0ab87c50556339b74050d2a626a55b4191 (patch)
tree5bfb122411cfc8a58a1d0a4ec4636c64efbcbd07 /include/ansel
parentUpdate Ansel_integration_guide.md (diff)
downloadanselsdk-3f2d7c0ab87c50556339b74050d2a626a55b4191.tar.xz
anselsdk-3f2d7c0ab87c50556339b74050d2a626a55b4191.zip
Updating Ansel SDK to version 1.2. Introducing game-driven UI controls (sliders and booleans).
Diffstat (limited to 'include/ansel')
-rw-r--r--include/ansel/Camera.h2
-rw-r--r--include/ansel/Configuration.h22
-rw-r--r--include/ansel/Defines.h2
-rw-r--r--include/ansel/Hints.h2
-rw-r--r--include/ansel/Session.h2
-rw-r--r--include/ansel/Version.h8
6 files changed, 20 insertions, 18 deletions
diff --git a/include/ansel/Camera.h b/include/ansel/Camera.h
index cdd3d9f..435b53f 100644
--- a/include/ansel/Camera.h
+++ b/include/ansel/Camera.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright 2015 NVIDIA Corporation. All rights reserved.
+// Copyright 2016 NVIDIA Corporation. All rights reserved.
#pragma once
#include <ansel/Defines.h>
diff --git a/include/ansel/Configuration.h b/include/ansel/Configuration.h
index e172e57..c3cf9c9 100644
--- a/include/ansel/Configuration.h
+++ b/include/ansel/Configuration.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright 2015 NVIDIA Corporation. All rights reserved.
+// Copyright 2016 NVIDIA Corporation. All rights reserved.
#pragma once
#include <ansel/Defines.h>
@@ -69,7 +69,7 @@ namespace ansel
uint32_t captureSettleLatency;
// Game scale, the size of a world unit measured in meters
float metersInWorldUnit;
- // Integration will support Camera::screenOriginXOffset/screenOriginYOffset
+ // Integration will support Camera::projectionOffsetX/projectionOffsetY
bool isCameraOffcenteredProjectionSupported;
// Integration will support Camera::position
bool isCameraTranslationSupported;
@@ -98,20 +98,22 @@ namespace ansel
// The window handle for the game/application where input messages are processed
void* gameWindowHandle;
- // Called when user activates Ansel. Return false if the game cannot comply with the
- // request. If the function returns true the following must be done:
+ // Called when user activates Ansel. Return kDisallowed if the game cannot comply with the
+ // request. If the function returns kAllowed the following must be done:
// 1. Change the SessionConfigruation settings, but only where you need to (the object
// is already populated with default settings).
- // 2. On the next update loop the game will be in an Ansel session. This requires the game
- // to
- // a) stop drawing any UI or HUD related elements
- // b) pause the simulation (if possible)
- // c) call ansel::updateCamera and perform associated processing
+ // 2. On the next update loop the game will be in an Ansel session. During an Ansel session
+ // the game :
+ // a) Must stop drawing UI and HUD elements on the screen, including mouse cursor
+ // b) Must call ansel::updateCamera on every frame
+ // c) Should pause rendering time (i.e. no movement should be visible in the world)
+ // d) Should not act on any input from mouse and keyboard and must not act on any input
+ // from gamepads
// 3. Step 2 is repeated on every iteration of update loop until Session is stopped.
StartSessionCallback startSessionCallback;
// Called when Ansel is deactivated. This call will only be made if the previous call
- // to the startSessionCallback returned true.
+ // to the startSessionCallback returned kAllowed.
// Normally games will use this callback to restore their camera to the settings it had
// when the Ansel session was started.
StopSessionCallback stopSessionCallback;
diff --git a/include/ansel/Defines.h b/include/ansel/Defines.h
index 56e76bc..1526c76 100644
--- a/include/ansel/Defines.h
+++ b/include/ansel/Defines.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright 2015 NVIDIA Corporation. All rights reserved.
+// Copyright 2016 NVIDIA Corporation. All rights reserved.
#pragma once
diff --git a/include/ansel/Hints.h b/include/ansel/Hints.h
index 81068a7..943482e 100644
--- a/include/ansel/Hints.h
+++ b/include/ansel/Hints.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright 2015 NVIDIA Corporation. All rights reserved.
+// Copyright 2016 NVIDIA Corporation. All rights reserved.
#pragma once
#include <cstdint>
diff --git a/include/ansel/Session.h b/include/ansel/Session.h
index 53520e4..0897045 100644
--- a/include/ansel/Session.h
+++ b/include/ansel/Session.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright 2015 NVIDIA Corporation. All rights reserved.
+// Copyright 2016 NVIDIA Corporation. All rights reserved.
#pragma once
#include <ansel/Defines.h>
diff --git a/include/ansel/Version.h b/include/ansel/Version.h
index 27f9d2b..fa7623e 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 1
-#define ANSEL_SDK_MINIMUM_DRIVER_VERSION "378.49"
+#define ANSEL_SDK_PRODUCT_VERSION_MINOR 2
+#define ANSEL_SDK_MINIMUM_DRIVER_VERSION "378.78"
// 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 1027
-#define ANSEL_SDK_COMMIT_HASH 0x6e9b4e3a
+#define ANSEL_SDK_BUILD_NUMBER 220
+#define ANSEL_SDK_COMMIT_HASH 0x9d1f1b9d
#define ANSEL_SDK_VERSION ( uint64_t(ANSEL_SDK_PRODUCT_VERSION_MAJOR) << 48 | uint64_t(ANSEL_SDK_PRODUCT_VERSION_MINOR) << 32 \
| ANSEL_SDK_COMMIT_HASH )