Skip to content
Browse files

Added library dependencies for lua scripting for xcode

  • Loading branch information...
1 parent 81b2b3f commit 1b73bab2b26ac370dccfc22f919ebdd7c434909a @seanpaultaylor seanpaultaylor committed
Showing with 2,468 additions and 134 deletions.
  1. BIN bin/macosx/gameplay-luagen
  2. BIN external-deps/lua/lib/ios/armv7/liblua.a
  3. BIN external-deps/lua/lib/ios/i386/liblua.a
  4. BIN external-deps/lua/lib/macosx/liblua.a
  5. BIN external-deps/tinyxml2/lib/macosx/libtinyxml2.a
  6. +258 −0 gameplay-luagen/gameplay-luagen.xcodeproj/project.pbxproj
  7. +113 −0 gameplay-luagen/gameplay-luagen.xcodeproj/xcshareddata/xcschemes/gameplay-luagen.xcscheme
  8. +4 −0 gameplay-luagen/src/Base.h
  9. +2 −2 gameplay-luagen/src/ClassBinding.cpp
  10. +1 −1 gameplay-luagen/src/DebugNew.cpp
  11. +1 −0 gameplay-luagen/src/FunctionBinding.cpp
  12. +13 −13 gameplay-luagen/src/Generator.cpp
  13. +4 −0 gameplay-luagen/src/main.cpp
  14. +20 −2 gameplay-samples/sample00-mesh/sample00-mesh.xcodeproj/project.pbxproj
  15. +18 −0 gameplay-samples/sample01-longboard/sample01-longboard.xcodeproj/project.pbxproj
  16. +18 −0 gameplay-samples/sample02-spaceship/sample02-spaceship.xcodeproj/project.pbxproj
  17. +5 −0 gameplay-samples/sample03-character/game.atc.config
  18. +33 −41 gameplay-samples/sample03-character/game.config
  19. +33 −33 gameplay-samples/sample03-character/game.png.config
  20. +1 −1 gameplay-samples/sample03-character/game.pvrtc.config
  21. +18 −0 gameplay-samples/sample03-character/sample03-character.xcodeproj/project.pbxproj
  22. +48 −28 gameplay-samples/sample04-particles/sample04-particles.xcodeproj/project.pbxproj
  23. +1,864 −9 gameplay/gameplay.xcodeproj/project.pbxproj
  24. +5 −0 gameplay/src/AnimationClip.h
  25. +5 −0 gameplay/src/Control.h
  26. +4 −4 gameplay/src/ScriptController.inl
View
BIN bin/macosx/gameplay-luagen
Binary file not shown.
View
BIN external-deps/lua/lib/ios/armv7/liblua.a
Binary file not shown.
View
BIN external-deps/lua/lib/ios/i386/liblua.a
Binary file not shown.
View
BIN external-deps/lua/lib/macosx/liblua.a
Binary file not shown.
View
BIN external-deps/tinyxml2/lib/macosx/libtinyxml2.a
Binary file not shown.
View
258 gameplay-luagen/gameplay-luagen.xcodeproj/project.pbxproj
@@ -0,0 +1,258 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 42B7F6FD15B06EFE002BB8C3 /* ClassBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6F215B06EFE002BB8C3 /* ClassBinding.cpp */; };
+ 42B7F6FE15B06EFE002BB8C3 /* DebugNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6F415B06EFE002BB8C3 /* DebugNew.cpp */; };
+ 42B7F6FF15B06EFE002BB8C3 /* FunctionBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6F715B06EFE002BB8C3 /* FunctionBinding.cpp */; };
+ 42B7F70015B06EFE002BB8C3 /* Generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6F915B06EFE002BB8C3 /* Generator.cpp */; };
+ 42B7F70115B06EFE002BB8C3 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6FB15B06EFE002BB8C3 /* main.cpp */; };
+ 42B7F71215B06F67002BB8C3 /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7F71115B06F67002BB8C3 /* libtinyxml2.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+ 42B7F6DE15B06E85002BB8C3 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = /usr/share/man/man1/;
+ dstSubfolderSpec = 0;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+ 42B7F6E015B06E85002BB8C3 /* gameplay-luagen */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gameplay-luagen"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 42B7F6F115B06EFE002BB8C3 /* Base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Base.h; path = src/Base.h; sourceTree = SOURCE_ROOT; };
+ 42B7F6F215B06EFE002BB8C3 /* ClassBinding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClassBinding.cpp; path = src/ClassBinding.cpp; sourceTree = SOURCE_ROOT; };
+ 42B7F6F315B06EFE002BB8C3 /* ClassBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClassBinding.h; path = src/ClassBinding.h; sourceTree = SOURCE_ROOT; };
+ 42B7F6F415B06EFE002BB8C3 /* DebugNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DebugNew.cpp; path = src/DebugNew.cpp; sourceTree = SOURCE_ROOT; };
+ 42B7F6F515B06EFE002BB8C3 /* DebugNew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebugNew.h; path = src/DebugNew.h; sourceTree = SOURCE_ROOT; };
+ 42B7F6F615B06EFE002BB8C3 /* EnumBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EnumBinding.h; path = src/EnumBinding.h; sourceTree = SOURCE_ROOT; };
+ 42B7F6F715B06EFE002BB8C3 /* FunctionBinding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FunctionBinding.cpp; path = src/FunctionBinding.cpp; sourceTree = SOURCE_ROOT; };
+ 42B7F6F815B06EFE002BB8C3 /* FunctionBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FunctionBinding.h; path = src/FunctionBinding.h; sourceTree = SOURCE_ROOT; };
+ 42B7F6F915B06EFE002BB8C3 /* Generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Generator.cpp; path = src/Generator.cpp; sourceTree = SOURCE_ROOT; };
+ 42B7F6FA15B06EFE002BB8C3 /* Generator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Generator.h; path = src/Generator.h; sourceTree = SOURCE_ROOT; };
+ 42B7F6FB15B06EFE002BB8C3 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
+ 42B7F6FC15B06EFE002BB8C3 /* TypedefBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TypedefBinding.h; path = src/TypedefBinding.h; sourceTree = SOURCE_ROOT; };
+ 42B7F71115B06F67002BB8C3 /* libtinyxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtinyxml2.a; path = "../external-deps/tinyxml2/lib/macosx/libtinyxml2.a"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 42B7F6DD15B06E85002BB8C3 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 42B7F71215B06F67002BB8C3 /* libtinyxml2.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 42B7F6D515B06E85002BB8C3 = {
+ isa = PBXGroup;
+ children = (
+ 42B7F6E315B06E85002BB8C3 /* src */,
+ 42B7F70B15B06F3A002BB8C3 /* Libraries */,
+ 42B7F6E115B06E85002BB8C3 /* Products */,
+ );
+ sourceTree = "<group>";
+ };
+ 42B7F6E115B06E85002BB8C3 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 42B7F6E015B06E85002BB8C3 /* gameplay-luagen */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 42B7F6E315B06E85002BB8C3 /* src */ = {
+ isa = PBXGroup;
+ children = (
+ 42B7F6F115B06EFE002BB8C3 /* Base.h */,
+ 42B7F6F215B06EFE002BB8C3 /* ClassBinding.cpp */,
+ 42B7F6F315B06EFE002BB8C3 /* ClassBinding.h */,
+ 42B7F6F415B06EFE002BB8C3 /* DebugNew.cpp */,
+ 42B7F6F515B06EFE002BB8C3 /* DebugNew.h */,
+ 42B7F6F615B06EFE002BB8C3 /* EnumBinding.h */,
+ 42B7F6F715B06EFE002BB8C3 /* FunctionBinding.cpp */,
+ 42B7F6F815B06EFE002BB8C3 /* FunctionBinding.h */,
+ 42B7F6F915B06EFE002BB8C3 /* Generator.cpp */,
+ 42B7F6FA15B06EFE002BB8C3 /* Generator.h */,
+ 42B7F6FB15B06EFE002BB8C3 /* main.cpp */,
+ 42B7F6FC15B06EFE002BB8C3 /* TypedefBinding.h */,
+ );
+ name = src;
+ path = "gameplay-luagen";
+ sourceTree = "<group>";
+ };
+ 42B7F70B15B06F3A002BB8C3 /* Libraries */ = {
+ isa = PBXGroup;
+ children = (
+ 42B7F71115B06F67002BB8C3 /* libtinyxml2.a */,
+ );
+ name = Libraries;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 42B7F6DF15B06E85002BB8C3 /* gameplay-luagen */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 42B7F6EA15B06E85002BB8C3 /* Build configuration list for PBXNativeTarget "gameplay-luagen" */;
+ buildPhases = (
+ 42B7F6DC15B06E85002BB8C3 /* Sources */,
+ 42B7F6DD15B06E85002BB8C3 /* Frameworks */,
+ 42B7F6DE15B06E85002BB8C3 /* CopyFiles */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "gameplay-luagen";
+ productName = "gameplay-luagen";
+ productReference = 42B7F6E015B06E85002BB8C3 /* gameplay-luagen */;
+ productType = "com.apple.product-type.tool";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 42B7F6D715B06E85002BB8C3 /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0430;
+ };
+ buildConfigurationList = 42B7F6DA15B06E85002BB8C3 /* Build configuration list for PBXProject "gameplay-luagen" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ );
+ mainGroup = 42B7F6D515B06E85002BB8C3;
+ productRefGroup = 42B7F6E115B06E85002BB8C3 /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 42B7F6DF15B06E85002BB8C3 /* gameplay-luagen */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 42B7F6DC15B06E85002BB8C3 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 42B7F6FD15B06EFE002BB8C3 /* ClassBinding.cpp in Sources */,
+ 42B7F6FE15B06EFE002BB8C3 /* DebugNew.cpp in Sources */,
+ 42B7F6FF15B06EFE002BB8C3 /* FunctionBinding.cpp in Sources */,
+ 42B7F70015B06EFE002BB8C3 /* Generator.cpp in Sources */,
+ 42B7F70115B06EFE002BB8C3 /* main.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ 42B7F6E815B06E85002BB8C3 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ COPY_PHASE_STRIP = NO;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = macosx;
+ };
+ name = Debug;
+ };
+ 42B7F6E915B06E85002BB8C3 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ SDKROOT = macosx;
+ };
+ name = Release;
+ };
+ 42B7F6EB15B06E85002BB8C3 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ HEADER_SEARCH_PATHS = "../external-deps/tinyxml2/include";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../external-deps/tinyxml2/lib/macosx\"",
+ );
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ 42B7F6EC15B06E85002BB8C3 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ HEADER_SEARCH_PATHS = "../external-deps/tinyxml2/include";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../external-deps/tinyxml2/lib/macosx\"",
+ );
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 42B7F6DA15B06E85002BB8C3 /* Build configuration list for PBXProject "gameplay-luagen" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 42B7F6E815B06E85002BB8C3 /* Debug */,
+ 42B7F6E915B06E85002BB8C3 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 42B7F6EA15B06E85002BB8C3 /* Build configuration list for PBXNativeTarget "gameplay-luagen" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 42B7F6EB15B06E85002BB8C3 /* Debug */,
+ 42B7F6EC15B06E85002BB8C3 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 42B7F6D715B06E85002BB8C3 /* Project object */;
+}
View
113 gameplay-luagen/gameplay-luagen.xcodeproj/xcshareddata/xcschemes/gameplay-luagen.xcscheme
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ version = "1.7">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "42B7F6DF15B06E85002BB8C3"
+ BuildableName = "gameplay-luagen"
+ BlueprintName = "gameplay-luagen"
+ ReferencedContainer = "container:gameplay-luagen.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "42B7F6DF15B06E85002BB8C3"
+ BuildableName = "gameplay-luagen"
+ BlueprintName = "gameplay-luagen"
+ ReferencedContainer = "container:gameplay-luagen.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <PreActions>
+ <ExecutionAction
+ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+ <ActionContent
+ title = "Run Script"
+ scriptText = "rm ${SRCROOT}/../gameplay/src/lua/*&#10;">
+ <EnvironmentBuildable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "42B7F6DF15B06E85002BB8C3"
+ BuildableName = "gameplay-luagen"
+ BlueprintName = "gameplay-luagen"
+ ReferencedContainer = "container:gameplay-luagen.xcodeproj">
+ </BuildableReference>
+ </EnvironmentBuildable>
+ </ActionContent>
+ </ExecutionAction>
+ </PreActions>
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "42B7F6DF15B06E85002BB8C3"
+ BuildableName = "gameplay-luagen"
+ BlueprintName = "gameplay-luagen"
+ ReferencedContainer = "container:gameplay-luagen.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <CommandLineArguments>
+ <CommandLineArgument
+ argument = "$(PROJECT_DIR)/xml"
+ isEnabled = "YES">
+ </CommandLineArgument>
+ <CommandLineArgument
+ argument = "$(PROJECT_DIR)/../gameplay/src/lua/"
+ isEnabled = "YES">
+ </CommandLineArgument>
+ </CommandLineArguments>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "42B7F6DF15B06E85002BB8C3"
+ BuildableName = "gameplay-luagen"
+ BlueprintName = "gameplay-luagen"
+ ReferencedContainer = "container:gameplay-luagen.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
View
4 gameplay-luagen/src/Base.h
@@ -6,6 +6,8 @@
#include <set>
#include <string>
#include <vector>
+#include <sys/types.h>
+#include <sys/stat.h>
using namespace std;
#define LUA_GLOBAL_FILENAME "lua_Global"
@@ -21,6 +23,8 @@ using namespace std;
#pragma warning(disable : 4996)
#pragma warning(disable : 4244)
#pragma warning(disable : 4345)
+#else
+#include <dirent.h>
#endif
// Object deletion macro
View
4 gameplay-luagen/src/ClassBinding.cpp
@@ -91,7 +91,7 @@ void ClassBinding::write(string dir, const set<string>& includes, string* bindin
// Write out the header.
{
string path = dir + string("lua_") + uniquename + string(".h");
- ofstream o(path);
+ ofstream o(path.c_str());
if (!o)
{
GP_ERROR("Failed to open file '%s' for generating Lua bindings.", path.c_str());
@@ -131,7 +131,7 @@ void ClassBinding::write(string dir, const set<string>& includes, string* bindin
// Write out the implementation.
{
string path = dir + string("lua_") + uniquename + string(".cpp");
- ofstream o(path);
+ ofstream o(path.c_str());
if (!o)
{
GP_ERROR("Failed to open file '%s' for generating Lua bindings.", path.c_str());
View
2 gameplay-luagen/src/DebugNew.cpp
@@ -282,7 +282,7 @@ extern void printMemoryLeaks()
else
printError("[memory] LEAK: HEAP allocation leak at address %#x of size %d from line %d in file '%s'.\n", rec->address, rec->size, rec->line, rec->file);
#else
- gameplay::printError("[memory] LEAK: HEAP allocation leak at address %#x of size %d from line %d in file '%s'.\n", rec->address, rec->size, rec->line, rec->file);
+ printError("[memory] LEAK: HEAP allocation leak at address %#x of size %d from line %d in file '%s'.\n", rec->address, rec->size, rec->line, rec->file);
#endif
rec = rec->next;
}
View
1 gameplay-luagen/src/FunctionBinding.cpp
@@ -975,6 +975,7 @@ static inline void outputReturnValue(ostream& o, const FunctionBinding& b, int i
break;
case FunctionBinding::Param::TYPE_DESTRUCTOR:
case FunctionBinding::Param::TYPE_VOID:
+ default:
o << "\n";
indent(o, indentLevel);
o << "return 0;\n";
View
26 gameplay-luagen/src/Generator.cpp
@@ -52,7 +52,6 @@ string Generator::getUniqueNameFromRef(string refId)
vector<string> Generator::getScopePath(string classname, string ns)
{
size_t i = classname.find("::");
- int index = 0;
vector<string> scopePath;
while (i != classname.npos)
{
@@ -201,8 +200,7 @@ void Generator::run(string inDir, string outDir)
cout << "Parsing namespace " << name << "...\n";
getNamespace(node, name);
}
- else if ((kind && strcmp(kind, "class") == 0 || strcmp(kind, "struct") == 0) &&
- strcmp(node->Attribute("prot"), "public") == 0)
+ else if ( (kind && (strcmp(kind, "class") == 0 || strcmp(kind, "struct") == 0) ) && strcmp(node->Attribute("prot"), "public") == 0)
{
string name = getCompoundName(node);
cout << "Parsing class/struct " << name << "...\n";
@@ -1326,14 +1324,16 @@ void Generator::resolveTypes()
void Generator::generateBindings()
{
string* bindingNS = new string("gameplay");
-
- ofstream luaAllH(_outDir + string(LUA_ALL_BINDINGS_FILENAME) + string(".h"));
+
+ string luaAllHStr = _outDir + string(LUA_ALL_BINDINGS_FILENAME) + string(".h");
+ ofstream luaAllH(luaAllHStr.c_str());
string includeGuard = string(LUA_ALL_BINDINGS_FILENAME) + string("_H_");
transform(includeGuard.begin(), includeGuard.end(), includeGuard.begin(), ::toupper);
luaAllH << "#ifndef " << includeGuard << "\n";
luaAllH << "#define " << includeGuard << "\n\n";
- ofstream luaAllCpp(_outDir + string(LUA_ALL_BINDINGS_FILENAME) + string(".cpp"));
+ string luaAllCppStr = _outDir + string(LUA_ALL_BINDINGS_FILENAME) + string(".cpp");
+ ofstream luaAllCpp(luaAllCppStr.c_str());
luaAllCpp << "#include \"Base.h\"\n";
luaAllCpp << "#include \"" << string(LUA_ALL_BINDINGS_FILENAME) << ".h\"\n\n";
if (bindingNS)
@@ -1373,7 +1373,8 @@ void Generator::generateBindings()
for (map<string, EnumBinding>::iterator iter = _enums.begin(); iter != _enums.end(); iter++)
{
// Header.
- ofstream enumH(_outDir + string("lua_") + getUniqueName(iter->first) + string(".h"));
+ string enumHStr = _outDir + string("lua_") + getUniqueName(iter->first) + string(".h");
+ ofstream enumH(enumHStr.c_str());
includeGuard = string("lua_") + getUniqueName(iter->first) + string("_H_");
transform(includeGuard.begin(), includeGuard.end(), includeGuard.begin(), ::toupper);
enumH << "#ifndef " << includeGuard << "\n";
@@ -1399,7 +1400,8 @@ void Generator::generateBindings()
enumH.close();
// Implementation.
- ofstream enumCpp(_outDir + string("lua_") + getUniqueName(iter->first) + string(".cpp"));
+ string enumCppStr = _outDir + string("lua_") + getUniqueName(iter->first) + string(".cpp");
+ ofstream enumCpp(enumCppStr.c_str());
enumCpp << "#include \"Base.h\"\n";
enumCpp << "#include \"lua_" << getUniqueName(iter->first) << ".h\"\n\n";
@@ -1492,7 +1494,7 @@ void Generator::generateBindings()
// Write out the header file.
{
string path = _outDir + string(LUA_GLOBAL_FILENAME) + string(".h");
- ofstream global(path);
+ ofstream global(path.c_str());
if (!global)
{
GP_ERROR("Failed to open file '%s' for generating Lua bindings.", path.c_str());
@@ -1548,7 +1550,7 @@ void Generator::generateBindings()
// Write out the implementation.
{
string path = _outDir + string(LUA_GLOBAL_FILENAME) + string(".cpp");
- ofstream global(path);
+ ofstream global(path.c_str());
if (!global)
{
GP_ERROR("Failed to open file '%s' for generating Lua bindings.", path.c_str());
@@ -1823,9 +1825,7 @@ static bool getFileList(string directory, vector<string>& files, bool (*isWanted
string filename = dp->d_name;
if (isWantedFile(filename))
{
- if (includePath)
- filename = string(directory) + filename;
-
+ filename = string(directory) + string("/") + filename;
files.push_back(filename);
}
}
View
4 gameplay-luagen/src/main.cpp
@@ -7,6 +7,7 @@ void printError(const char* format, ...)
{
va_list argptr;
va_start(argptr, format);
+#ifdef WIN32
int sz = vfprintf(stderr, format, argptr);
if (sz > 0)
{
@@ -16,6 +17,9 @@ void printError(const char* format, ...)
OutputDebugStringA(buf);
SAFE_DELETE_ARRAY(buf);
}
+#else
+ vfprintf(stderr, format, argptr);
+#endif
va_end(argptr);
}
View
22 gameplay-samples/sample00-mesh/sample00-mesh.xcodeproj/project.pbxproj
@@ -13,6 +13,9 @@
42A3C5DE146C96640091C1E4 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 42A3C5DD146C96640091C1E4 /* res */; };
42A3C5E4146CB7420091C1E4 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A3C5E3146CB7420091C1E4 /* libpng.a */; };
42A3C5E6146CB7690091C1E4 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A3C5E5146CB7690091C1E4 /* libz.dylib */; };
+ 42B7025A15B0A897002BB8C3 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7025915B0A897002BB8C3 /* liblua.a */; };
+ 42B7027815B0B278002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7027715B0B278002BB8C3 /* game.config */; };
+ 42B7027915B0B278002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7027715B0B278002BB8C3 /* game.config */; };
42BBCD34146C89F900D2A5F8 /* MeshGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BBCD32146C89F900D2A5F8 /* MeshGame.cpp */; };
42CCD4B4146D914B00353661 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42CCD4B3146D914B00353661 /* icon.png */; };
42CD0EE7147D92E60000361E /* libbullet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42CD0EE2147D92E60000361E /* libbullet.a */; };
@@ -49,6 +52,8 @@
42A3C5DD146C96640091C1E4 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
42A3C5E3146CB7420091C1E4 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/libpng/lib/macosx/libpng.a"; sourceTree = "<group>"; };
42A3C5E5146CB7690091C1E4 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+ 42B7025915B0A897002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/liblua.a"; sourceTree = "<group>"; };
+ 42B7027715B0B278002BB8C3 /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
42BBCD32146C89F900D2A5F8 /* MeshGame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MeshGame.cpp; path = src/MeshGame.cpp; sourceTree = SOURCE_ROOT; };
42BBCD33146C89F900D2A5F8 /* MeshGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MeshGame.h; path = src/MeshGame.h; sourceTree = SOURCE_ROOT; };
42CCD4B3146D914B00353661 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
@@ -87,6 +92,7 @@
4220A6E5146B121000CAEB3A /* QuartzCore.framework in Frameworks */,
42F68AA81469CDE100E0E3C4 /* OpenGL.framework in Frameworks */,
42F68AA71469CDE100E0E3C4 /* OpenAL.framework in Frameworks */,
+ 42B7025A15B0A897002BB8C3 /* liblua.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -120,6 +126,7 @@
42F68AA31469CC3000E0E3C4 /* sample00-mesh-macosx.plist */,
42458CB514C3AB1600EFFB61 /* sample00-mesh-ios.plist */,
42CCD4B3146D914B00353661 /* icon.png */,
+ 42B7027715B0B278002BB8C3 /* game.config */,
42A3C5DD146C96640091C1E4 /* res */,
4217006814697FF100A45C02 /* src */,
427D4F46147DC9460076760E /* Libraries */,
@@ -152,6 +159,7 @@
children = (
5B04C5EA14BFE25C00EB0071 /* libgameplay.a */,
42CD0EE2147D92E60000361E /* libbullet.a */,
+ 42B7025915B0A897002BB8C3 /* liblua.a */,
42CD0EE3147D92E60000361E /* libogg.a */,
42CD0EE4147D92E60000361E /* libvorbis.a */,
42CD0EE5147D92E60000361E /* libvorbisenc.a */,
@@ -265,8 +273,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 42A3C5DE146C96640091C1E4 /* res in Resources */,
42CCD4B4146D914B00353661 /* icon.png in Resources */,
+ 42B7027815B0B278002BB8C3 /* game.config in Resources */,
+ 42A3C5DE146C96640091C1E4 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -274,8 +283,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 5B04C5E114BFE1A200EB0071 /* res in Resources */,
5B04C5E214BFE1A200EB0071 /* icon.png in Resources */,
+ 42B7027915B0B278002BB8C3 /* game.config in Resources */,
+ 5B04C5E114BFE1A200EB0071 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -395,6 +405,7 @@
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -402,6 +413,7 @@
INFOPLIST_FILE = "sample00-mesh-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -425,6 +437,7 @@
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -432,6 +445,7 @@
INFOPLIST_FILE = "sample00-mesh-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -456,6 +470,7 @@
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -464,6 +479,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
@@ -491,6 +507,7 @@
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -499,6 +516,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
View
18 gameplay-samples/sample01-longboard/sample01-longboard.xcodeproj/project.pbxproj
@@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
+ 42B7025D15B0A8C3002BB8C3 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7025C15B0A8C3002BB8C3 /* liblua.a */; };
+ 42B7027515B0B259002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7027415B0B259002BB8C3 /* game.config */; };
+ 42B7027615B0B259002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7027415B0B259002BB8C3 /* game.config */; };
42CCD493146D80DA00353661 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42CCD492146D80DA00353661 /* Cocoa.framework */; };
42CCD4BF146D91D700353661 /* LongboardGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CCD4BD146D91D700353661 /* LongboardGame.cpp */; };
42CCD4C2146D91E800353661 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42CCD4C1146D91E800353661 /* icon.png */; };
@@ -43,6 +46,8 @@
/* Begin PBXFileReference section */
42458CB314C3AAF900EFFB61 /* sample01-longboard-ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample01-longboard-ios.plist"; sourceTree = "<group>"; };
+ 42B7025C15B0A8C3002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/liblua.a"; sourceTree = "<group>"; };
+ 42B7027415B0B259002BB8C3 /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
42C932E01491A1640098216A /* sample01-longboard-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample01-longboard-macosx.plist"; sourceTree = "<group>"; };
42CCD48E146D80DA00353661 /* sample01-longboard-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample01-longboard-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
42CCD492146D80DA00353661 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -87,6 +92,7 @@
42CCD4D1146D93F900353661 /* QuartzCore.framework in Frameworks */,
42CCD4D5146D941A00353661 /* OpenGL.framework in Frameworks */,
42CCD4D3146D941000353661 /* OpenAL.framework in Frameworks */,
+ 42B7025D15B0A8C3002BB8C3 /* liblua.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -119,6 +125,7 @@
children = (
5B04C69F14C0EC7B00EB0071 /* libgameplay.a */,
42CD0ED8147D92CA0000361E /* libbullet.a */,
+ 42B7025C15B0A8C3002BB8C3 /* liblua.a */,
42CD0ED9147D92CA0000361E /* libogg.a */,
42CD0EDA147D92CA0000361E /* libvorbis.a */,
42CD0EDB147D92CA0000361E /* libvorbisenc.a */,
@@ -135,6 +142,7 @@
42458CB314C3AAF900EFFB61 /* sample01-longboard-ios.plist */,
42C932E01491A1640098216A /* sample01-longboard-macosx.plist */,
42CCD4C1146D91E800353661 /* icon.png */,
+ 42B7027415B0B259002BB8C3 /* game.config */,
42CCD4DC146D950400353661 /* res */,
42CCD498146D80DA00353661 /* src */,
427D4F48147DC9610076760E /* Libraries */,
@@ -266,6 +274,7 @@
buildActionMask = 2147483647;
files = (
42CCD4C2146D91E800353661 /* icon.png in Resources */,
+ 42B7027515B0B259002BB8C3 /* game.config in Resources */,
42CCD4DD146D950400353661 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -275,6 +284,7 @@
buildActionMask = 2147483647;
files = (
5B04C68E14C0EBF900EB0071 /* icon.png in Resources */,
+ 42B7027615B0B259002BB8C3 /* game.config in Resources */,
5B04C68F14C0EBF900EB0071 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -388,6 +398,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -395,6 +406,7 @@
INFOPLIST_FILE = "sample01-longboard-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -418,6 +430,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -425,6 +438,7 @@
INFOPLIST_FILE = "sample01-longboard-macosx`.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -449,6 +463,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -457,6 +472,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
@@ -484,6 +500,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -492,6 +509,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
View
18 gameplay-samples/sample02-spaceship/sample02-spaceship.xcodeproj/project.pbxproj
@@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
+ 42B7026015B0A8D5002BB8C3 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7025F15B0A8D5002BB8C3 /* liblua.a */; };
+ 42B7026F15B0B202002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7026E15B0B202002BB8C3 /* game.config */; };
+ 42B7027015B0B202002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7026E15B0B202002BB8C3 /* game.config */; };
42CCD51B146EBF3600353661 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42CCD51A146EBF3600353661 /* Cocoa.framework */; };
42CCD549146EC0AE00353661 /* SpaceshipGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CCD547146EC0AE00353661 /* SpaceshipGame.cpp */; };
42CCD54B146EC10200353661 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42CCD54A146EC10200353661 /* QuartzCore.framework */; };
@@ -43,6 +46,8 @@
/* Begin PBXFileReference section */
42458CBA14C3AB4D00EFFB61 /* sample02-spaceship-ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample02-spaceship-ios.plist"; sourceTree = "<group>"; };
+ 42B7025F15B0A8D5002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/liblua.a"; sourceTree = "<group>"; };
+ 42B7026E15B0B202002BB8C3 /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
42C932E31491A18F0098216A /* sample02-spaceship-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample02-spaceship-macosx.plist"; sourceTree = "<group>"; };
42CCD516146EBF3600353661 /* sample02-spaceship-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample02-spaceship-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
42CCD51A146EBF3600353661 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -87,6 +92,7 @@
42CCD54B146EC10200353661 /* QuartzCore.framework in Frameworks */,
42CCD54F146EC11600353661 /* OpenGL.framework in Frameworks */,
42CCD54D146EC10E00353661 /* OpenAL.framework in Frameworks */,
+ 42B7026015B0A8D5002BB8C3 /* liblua.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -119,6 +125,7 @@
children = (
5B43D1B714C35A65008A5D9D /* libgameplay.a */,
42CD0EEE147D932B0000361E /* libbullet.a */,
+ 42B7025F15B0A8D5002BB8C3 /* liblua.a */,
42CD0EEF147D932B0000361E /* libogg.a */,
42CD0EF0147D932B0000361E /* libvorbis.a */,
42CD0EF1147D932B0000361E /* libvorbisenc.a */,
@@ -132,6 +139,7 @@
42CCD50B146EBF3600353661 = {
isa = PBXGroup;
children = (
+ 42B7026E15B0B202002BB8C3 /* game.config */,
42458CBA14C3AB4D00EFFB61 /* sample02-spaceship-ios.plist */,
42C932E31491A18F0098216A /* sample02-spaceship-macosx.plist */,
42CCD55D146EC24F00353661 /* icon.png */,
@@ -266,6 +274,7 @@
buildActionMask = 2147483647;
files = (
42CCD55E146EC24F00353661 /* icon.png in Resources */,
+ 42B7026F15B0B202002BB8C3 /* game.config in Resources */,
42CCD560146EC27A00353661 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -275,6 +284,7 @@
buildActionMask = 2147483647;
files = (
5B43D1AF14C35A0E008A5D9D /* icon.png in Resources */,
+ 42B7027015B0B202002BB8C3 /* game.config in Resources */,
5B43D1B014C35A0E008A5D9D /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -386,6 +396,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -393,6 +404,7 @@
INFOPLIST_FILE = "sample02-spaceship-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -414,6 +426,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -421,6 +434,7 @@
INFOPLIST_FILE = "sample02-spaceship-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -443,6 +457,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -451,6 +466,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
@@ -476,6 +492,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -484,6 +501,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
View
5 gameplay-samples/sample03-character/game.atc.config
@@ -33,3 +33,8 @@ aliases
wood = res/atc/wood.atc
woodn = res/atc/woodn.atc
}
+
+gamepads
+{
+form = res/common/gamepad.form
+}
View
74 gameplay-samples/sample03-character/game.config
@@ -1,48 +1,40 @@
-window
-{
-title = Character
-width = 1280
-height = 720
-fullscreen = false
-}
-
aliases
{
-backboard = res/dxt/backboard.dds
-basketball = res/dxt/basketball.dds
-basketballnet = res/dxt/basketballnet.dds
-book = res/dxt/book.dds
-bookshelf = res/dxt/bookshelf.dds
-character = res/dxt/character.dds
-decals = res/dxt/decals.dds
-door = res/dxt/door.dds
-doorframe = res/dxt/doorframe.dds
-easel = res/dxt/easel.dds
-floor = res/dxt/floor.dds
-floortiles = res/dxt/floortiles.dds
-gamepad = res/dxt/gamepad.dds
-playtable = res/dxt/playtable.dds
-shadow = res/dxt/shadow.dds
-storageorganizer = res/dxt/storageorganizer.dds
-tableleg1 = res/dxt/tableleg1.dds
-tableleg2 = res/dxt/tableleg2.dds
-tableleg3 = res/dxt/tableleg3.dds
-tableleg4 = res/dxt/tableleg4.dds
-tabletop = res/dxt/tabletop.dds
-tiles = res/dxt/tiles.dds
-tilesn = res/dxt/tilesn.dds
-toybox = res/dxt/toybox.dds
-walleast = res/dxt/walleast.dds
-wallnorth = res/dxt/wallnorth.dds
-walloverhang = res/dxt/walloverhang.dds
-wallsouth = res/dxt/wallsouth.dds
-wallwest = res/dxt/wallwest.dds
-windowledge = res/dxt/windowledge.dds
-wood = res/dxt/wood.dds
-woodn = res/dxt/woodn.dds
+backboard = res/pvrtc/backboard.pvr
+basketball = res/pvrtc/basketball.pvr
+basketballnet = res/pvrtc/basketballnet.pvr
+book = res/pvrtc/book.pvr
+bookshelf = res/pvrtc/bookshelf.pvr
+character = res/pvrtc/character.pvr
+decals = res/pvrtc/decals.pvr
+door = res/pvrtc/door.pvr
+doorframe = res/pvrtc/doorframe.pvr
+easel = res/pvrtc/easel.pvr
+floor = res/pvrtc/floor.pvr
+floortiles = res/pvrtc/floortiles.pvr
+gamepad = res/pvrtc/gamepad.pvr
+playtable = res/pvrtc/playtable.pvr
+shadow = res/pvrtc/shadow.pvr
+storageorganizer = res/pvrtc/storageorganizer.pvr
+tableleg1 = res/pvrtc/tableleg1.pvr
+tableleg2 = res/pvrtc/tableleg2.pvr
+tableleg3 = res/pvrtc/tableleg3.pvr
+tableleg4 = res/pvrtc/tableleg4.pvr
+tabletop = res/pvrtc/tabletop.pvr
+tiles = res/pvrtc/tiles.pvr
+tilesn = res/pvrtc/tilesn.pvr
+toybox = res/pvrtc/toybox.pvr
+walleast = res/pvrtc/walleast.pvr
+wallnorth = res/pvrtc/wallnorth.pvr
+walloverhang = res/pvrtc/walloverhang.pvr
+wallsouth = res/pvrtc/wallsouth.pvr
+wallwest = res/pvrtc/wallwest.pvr
+windowledge = res/pvrtc/windowledge.pvr
+wood = res/pvrtc/wood.pvr
+woodn = res/pvrtc/woodn.pvr
}
gamepads
{
form = res/common/gamepad.form
-}
+}
View
66 gameplay-samples/sample03-character/game.png.config
@@ -1,40 +1,40 @@
aliases
{
-backboard = res/png/backboard.png
-basketball = res/png/basketball.png
-basketballnet = res/png/basketballnet.png
-book = res/png/book.png
-bookshelf = res/png/bookshelf.png
-character = res/png/character.png
-decals = res/png/decals.png
-door = res/png/door.png
-doorframe = res/png/doorframe.png
-easel = res/png/easel.png
-floor = res/png/floor.png
-floortiles = res/png/floortiles.png
-gamepad = res/png/gamepad.png
-playtable = res/png/playtable.png
-shadow = res/png/shadow.png
-storageorganizer = res/png/storageorganizer.png
-tableleg1 = res/png/tableleg1.png
-tableleg2 = res/png/tableleg2.png
-tableleg3 = res/png/tableleg3.png
-tableleg4 = res/png/tableleg4.png
-tabletop = res/png/tabletop.png
-tiles = res/png/tiles.png
-tilesn = res/png/tilesn.png
-toybox = res/png/toybox.png
-walleast = res/png/walleast.png
-wallnorth = res/png/wallnorth.png
-walloverhang = res/png/walloverhang.png
-wallsouth = res/png/wallsouth.png
-wallwest = res/png/wallwest.png
-windowledge = res/png/windowledge.png
-wood = res/png/wood.png
-woodn = res/png/woodn.png
+backboard = res/design/backboard.png
+basketball = res/design/basketball.png
+basketballnet = res/design/basketballnet.png
+book = res/design/book.png
+bookshelf = res/design/bookshelf.png
+character = res/design/character.png
+decals = res/design/decals.png
+door = res/design/door.png
+doorframe = res/design/doorframe.png
+easel = res/design/easel.png
+floor = res/design/floor.png
+floortiles = res/design/floortiles.png
+gamepad = res/design/gamepad.png
+playtable = res/design/playtable.png
+shadow = res/design/shadow.png
+storageorganizer = res/design/storageorganizer.png
+tableleg1 = res/design/tableleg1.png
+tableleg2 = res/design/tableleg2.png
+tableleg3 = res/design/tableleg3.png
+tableleg4 = res/design/tableleg4.png
+tabletop = res/design/tabletop.png
+tiles = res/design/tiles.png
+tilesn = res/design/tilesn.png
+toybox = res/design/toybox.png
+walleast = res/design/walleast.png
+wallnorth = res/design/wallnorth.png
+walloverhang = res/design/walloverhang.png
+wallsouth = res/design/wallsouth.png
+wallwest = res/design/wallwest.png
+windowledge = res/design/windowledge.png
+wood = res/design/wood.png
+woodn = res/design/woodn.png
}
-gamepad
+gamepads
{
form = res/common/gamepad.form
}
View
2 gameplay-samples/sample03-character/game.pvrtc.config
@@ -34,7 +34,7 @@ wood = res/pvrtc/wood.pvr
woodn = res/pvrtc/woodn.pvr
}
-gamepad
+gamepads
{
form = res/common/gamepad.form
}
View
18 gameplay-samples/sample03-character/sample03-character.xcodeproj/project.pbxproj
@@ -9,6 +9,9 @@
/* Begin PBXBuildFile section */
4239E08715755BDA005EA3F6 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 4239E08615755BDA005EA3F6 /* res */; };
4239E08815755BDA005EA3F6 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 4239E08615755BDA005EA3F6 /* res */; };
+ 42B7026315B0A8F2002BB8C3 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7026215B0A8F2002BB8C3 /* liblua.a */; };
+ 42B7026915B0B137002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7026815B0B137002BB8C3 /* game.config */; };
+ 42B7026A15B0B15D002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7026815B0B137002BB8C3 /* game.config */; };
42CCD571146EC4B300353661 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42CCD570146EC4B300353661 /* Cocoa.framework */; };
42CCD5A2146EC5BF00353661 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42CCD5A1146EC5BF00353661 /* OpenAL.framework */; };
42CCD5A4146EC5C600353661 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42CCD5A3146EC5C600353661 /* OpenGL.framework */; };
@@ -44,6 +47,8 @@
/* Begin PBXFileReference section */
4239E08615755BDA005EA3F6 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
42458CBF14C3ABF800EFFB61 /* sample03-character-ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample03-character-ios.plist"; sourceTree = "<group>"; };
+ 42B7026215B0A8F2002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/liblua.a"; sourceTree = "<group>"; };
+ 42B7026815B0B137002BB8C3 /* game.config */ = {isa = PBXFileReference; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
42C932E61491A1AC0098216A /* sample03-character-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample03-character-macosx.plist"; sourceTree = "<group>"; };
42CCD56C146EC4B300353661 /* sample03-character-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample03-character-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
42CCD570146EC4B300353661 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -89,6 +94,7 @@
42CCD5A6146EC5CE00353661 /* QuartzCore.framework in Frameworks */,
42CCD5A4146EC5C600353661 /* OpenGL.framework in Frameworks */,
42CCD5A2146EC5BF00353661 /* OpenAL.framework in Frameworks */,
+ 42B7026315B0A8F2002BB8C3 /* liblua.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -121,6 +127,7 @@
children = (
5B43D1E314C35F71008A5D9D /* libgameplay.a */,
42CD0EFA147D93560000361E /* libbullet.a */,
+ 42B7026215B0A8F2002BB8C3 /* liblua.a */,
42CD0EFB147D93560000361E /* libogg.a */,
42CD0EFC147D93560000361E /* libvorbis.a */,
42CD0EFD147D93560000361E /* libvorbisenc.a */,
@@ -137,6 +144,7 @@
42458CBF14C3ABF800EFFB61 /* sample03-character-ios.plist */,
42C932E61491A1AC0098216A /* sample03-character-macosx.plist */,
42CCD5B0146EC62A00353661 /* icon.png */,
+ 42B7026815B0B137002BB8C3 /* game.config */,
DDBBAE861574040C00D39DE7 /* game.dxt.config */,
DDBBAE8B1574067600D39DE7 /* game.pvrtc.config */,
4239E08615755BDA005EA3F6 /* res */,
@@ -270,6 +278,7 @@
buildActionMask = 2147483647;
files = (
42CCD5B1146EC62A00353661 /* icon.png in Resources */,
+ 42B7026A15B0B15D002BB8C3 /* game.config in Resources */,
4239E08715755BDA005EA3F6 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -279,6 +288,7 @@
buildActionMask = 2147483647;
files = (
5B43D1D814C35F4C008A5D9D /* icon.png in Resources */,
+ 42B7026915B0B137002BB8C3 /* game.config in Resources */,
4239E08815755BDA005EA3F6 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -390,6 +400,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -397,6 +408,7 @@
INFOPLIST_FILE = "sample03-character-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -418,6 +430,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -425,6 +438,7 @@
INFOPLIST_FILE = "sample03-character-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/macosx\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/macosx\"",
@@ -447,6 +461,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -455,6 +470,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
@@ -480,6 +496,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
../../gameplay/src,
+ "../../external-deps/lua/include",
"../../external-deps/libpng/include",
"../../external-deps/bullet/include",
"../../external-deps/oggvorbis/include",
@@ -488,6 +505,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
"\"$(SRCROOT)/../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
View
76 gameplay-samples/sample04-particles/sample04-particles.xcodeproj/project.pbxproj
@@ -8,6 +8,9 @@
/* Begin PBXBuildFile section */
42438B531491AD2000D218B8 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42438B521491AD2000D218B8 /* libgameplay.a */; };
+ 42B7026615B0A902002BB8C3 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7026515B0A902002BB8C3 /* liblua.a */; };
+ 42B7027215B0B219002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7027115B0B219002BB8C3 /* game.config */; };
+ 42B7027315B0B219002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7027115B0B219002BB8C3 /* game.config */; };
42C932C11491A0DB0098216A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C932C01491A0DB0098216A /* Cocoa.framework */; };
42C932EE1491A4CB0098216A /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42C932ED1491A4CB0098216A /* icon.png */; };
42C932F11491A5160098216A /* ParticlesGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C932EF1491A5160098216A /* ParticlesGame.cpp */; };
@@ -43,6 +46,8 @@
/* Begin PBXFileReference section */
42438B521491AD2000D218B8 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug/libgameplay.a"; sourceTree = "<group>"; };
+ 42B7026515B0A902002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/liblua.a"; sourceTree = "<group>"; };
+ 42B7027115B0B219002BB8C3 /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
42C932BC1491A0DB0098216A /* sample04-particles-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample04-particles-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
42C932C01491A0DB0098216A /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
42C932ED1491A4CB0098216A /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
@@ -87,6 +92,7 @@
42C9331D1491A6750098216A /* QuartzCore.framework in Frameworks */,
42C933171491A5EB0098216A /* OpenGL.framework in Frameworks */,
42C9331F1491A67F0098216A /* OpenAL.framework in Frameworks */,
+ 42B7026615B0A902002BB8C3 /* liblua.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -120,6 +126,7 @@
5B61611214CCC2200073B857 /* sample04-particles-macosx.plist */,
5B61612E14CCC24D0073B857 /* sample04-particles-ios.plist */,
42C932ED1491A4CB0098216A /* icon.png */,
+ 42B7027115B0B219002BB8C3 /* game.config */,
42C932F21491A53E0098216A /* res */,
42C932C61491A0DB0098216A /* src */,
42C932DD1491A1050098216A /* Libraries */,
@@ -160,6 +167,7 @@
children = (
42438B521491AD2000D218B8 /* libgameplay.a */,
42C933201491A6C70098216A /* libbullet.a */,
+ 42B7026515B0A902002BB8C3 /* liblua.a */,
42C933221491A6E50098216A /* libogg.a */,
42C933231491A6E50098216A /* libvorbis.a */,
42C933241491A6E50098216A /* libvorbisenc.a */,
@@ -265,6 +273,7 @@
buildActionMask = 2147483647;
files = (
42C932EE1491A4CB0098216A /* icon.png in Resources */,
+ 42B7027215B0B219002BB8C3 /* game.config in Resources */,
42C932F31491A53E0098216A /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -274,6 +283,7 @@
buildActionMask = 2147483647;
files = (
5B61612614CCC24C0073B857 /* icon.png in Resources */,
+ 42B7027315B0B219002BB8C3 /* game.config in Resources */,
5B61612714CCC24C0073B857 /* res in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -390,17 +400,20 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
- "../..//gameplay/src",
- "../..//external-deps/libpng/include",
- "../..//external-deps/bullet/include",
- "../..//external-deps/oggvorbis/include",
+ ../../gameplay/src,
+ "../../external-deps/lua/include",
+ "../../external-deps/libpng/include",
+ "../../external-deps/bullet/include",
+ "../../external-deps/oggvorbis/include",
);
INFOPLIST_FILE = "sample04-particles-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
- "\"../..//external-deps/libpng/lib/macosx\"",
- "\"../..//external-deps/bullet/lib/macosx\"",
- "\"../..//external-deps/oggvorbis/lib/macosx\"",
+ "\"../../external-deps/lua/lib/macosx\"",
+ "\"../../external-deps/libpng/lib/macosx\"",
+ "\"../../external-deps/bullet/lib/macosx\"",
+ "\"../../external-deps/oggvorbis/lib/macosx\"",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
);
USER_HEADER_SEARCH_PATHS = "";
WRAPPER_EXTENSION = app;
@@ -415,17 +428,20 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
- "../..//gameplay/src",
- "../..//external-deps/libpng/include",
- "../..//external-deps/bullet/include",
- "../..//external-deps/oggvorbis/include",
+ ../../gameplay/src,
+ "../../external-deps/lua/include",
+ "../../external-deps/libpng/include",
+ "../../external-deps/bullet/include",
+ "../../external-deps/oggvorbis/include",
);
INFOPLIST_FILE = "sample04-particles-macosx.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
- "\"../..//external-deps/libpng/lib/macosx\"",
- "\"../..//external-deps/bullet/lib/macosx\"",
- "\"../..//external-deps/oggvorbis/lib/macosx\"",
+ "\"../../external-deps/lua/lib/macosx\"",
+ "\"../../external-deps/libpng/lib/macosx\"",
+ "\"../../external-deps/bullet/lib/macosx\"",
+ "\"../../external-deps/oggvorbis/lib/macosx\"",
+ "\"$(SRCROOT)/../../external-deps/lua/lib/macosx\"",
);
USER_HEADER_SEARCH_PATHS = "";
WRAPPER_EXTENSION = app;
@@ -440,18 +456,20 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
- "../..//gameplay/src",
- "../..//external-deps/libpng/include",
- "../..//external-deps/bullet/include",
- "../..//external-deps/oggvorbis/include",
+ ../../gameplay/src,
+ "../../external-deps/lua/include",
+ "../../external-deps/libpng/include",
+ "../../external-deps/bullet/include",
+ "../../external-deps/oggvorbis/include",
);
INFOPLIST_FILE = "sample04-particles-ios.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
- "\"../..//external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
- "\"../..//external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
- "\"../..//external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
);
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@@ -469,18 +487,20 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
HEADER_SEARCH_PATHS = (
- "../..//gameplay/src",
- "../..//external-deps/libpng/include",
- "../..//external-deps/bullet/include",
- "../..//external-deps/oggvorbis/include",
+ ../../gameplay/src,
+ "../../external-deps/lua/include",
+ "../../external-deps/libpng/include",
+ "../../external-deps/bullet/include",
+ "../../external-deps/oggvorbis/include",
);
INFOPLIST_FILE = "sample04-particles-ios.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
- "\"../..//external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
- "\"../..//external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
- "\"../..//external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
+ "\"../../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
);
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
View
1,873 gameplay/gameplay.xcodeproj/project.pbxproj
1,864 additions, 9 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
5 gameplay/src/AnimationClip.h
@@ -64,6 +64,11 @@ class AnimationClip : public Ref
*/
END
};
+
+ /*
+ * Destructor.
+ */
+ virtual ~Listener() { }
/**
* Handles when animation event occurs.
View
5 gameplay/src/Control.h
@@ -140,6 +140,11 @@ class Control : public Ref, public AnimationTarget
*/
RIGHT_CLICK = 0x40,
};
+
+ /*
+ * Destructor.
+ */
+ virtual ~Listener() { }
/**
* Method called by controls when an event is triggered.
View
8 gameplay/src/ScriptController.inl
@@ -43,9 +43,9 @@ template<typename T>T* ScriptUtil::getObjectPointer(int index, const char* type,
lua_pop(ScriptController::__instance->_lua, 2);
T* ptr = (T*)((ScriptUtil::LuaObject*)p)->instance;
if (ptr)
- memcpy(&values[i], ptr, sizeof(T));
+ memcpy((void*)&values[i], (void*)ptr, sizeof(T));
else
- memset(&values[i], 0, sizeof(T));
+ memset((void*)&values[i], 0, sizeof(T));
lua_pop(ScriptController::__instance->_lua, 1);
continue;
@@ -62,9 +62,9 @@ template<typename T>T* ScriptUtil::getObjectPointer(int index, const char* type,
lua_pop(ScriptController::__instance->_lua, 2);
T* ptr = (T*)((ScriptUtil::LuaObject*)p)->instance;
if (ptr)
- memcpy(&values[i], ptr, sizeof(T));
+ memcpy((void*)&values[i], (void*)ptr, sizeof(T));
else
- memset(&values[i], 0, sizeof(T));
+ memset((void*)&values[i], 0, sizeof(T));
lua_pop(ScriptController::__instance->_lua, 1);
continue;
}

0 comments on commit 1b73bab

Please sign in to comment.
Something went wrong with that request. Please try again.