From 07d0f4d0bbf3477ac6a9584f726e8ec6ab285707 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 14 Apr 2014 21:25:09 -0700 Subject: Adding windows 0.3.1 SDK --- LibOVR/Src/OVR_JSON.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'LibOVR/Src/OVR_JSON.h') diff --git a/LibOVR/Src/OVR_JSON.h b/LibOVR/Src/OVR_JSON.h index ece84be..7a2e939 100644 --- a/LibOVR/Src/OVR_JSON.h +++ b/LibOVR/Src/OVR_JSON.h @@ -7,16 +7,16 @@ Created : April 9, 2013 Author : Brant Lewis Notes : -Copyright : Copyright 2013 Oculus VR, Inc. All Rights reserved. +Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved. -Licensed under the Oculus VR SDK License Version 2.0 (the "License"); -you may not use the Oculus VR SDK except in compliance with the License, +Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); +you may not use the Oculus VR Rift SDK except in compliance with the License, which is provided at the time of installation or download, or which otherwise accompanies this software in either electronic or hard copy form. You may obtain a copy of the License at -http://www.oculusvr.com/licenses/LICENSE-2.0 +http://www.oculusvr.com/licenses/LICENSE-3.1 Unless required by applicable law or agreed to in writing, the Oculus VR SDK distributed under the License is distributed on an "AS IS" BASIS, @@ -48,7 +48,6 @@ enum JSONItemType JSON_Object = 6 }; - //----------------------------------------------------------------------------- // ***** JSON @@ -90,7 +89,6 @@ public: // Saves a JSON object to a file. bool Save(const char* path); - // *** Object Member Access // These provide access to child items of the list. @@ -117,11 +115,13 @@ public: void AddStringItem(const char* name, const char* s) { AddItem(name, CreateString(s)); } // void ReplaceItem(unsigned index, JSON* new_item); // void DeleteItem(unsigned index); + void RemoveLast(); // *** Array Element Access // Add new elements to the end of array. void AddArrayElement(JSON *item); + void InsertArrayElement(int index, JSON* item); void AddArrayNumber(double n) { AddArrayElement(CreateNumber(n)); } void AddArrayString(const char* s) { AddArrayElement(CreateString(s)); } @@ -130,6 +130,7 @@ public: double GetArrayNumber(int index); const char* GetArrayString(int index); + JSON* Copy(); // Create a copy of this object protected: JSON(JSONItemType itemType = JSON_Object); -- cgit v1.2.3