From 7b0a6d1fe0117cf42a5776aaabda2db78599e5b8 Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 15 Nov 2020 19:29:01 +0800 Subject: *misc --- .gitignore | 368 +++++++++++++++++++++ .../Libraries/Framework/Animation/Animation.lua | 0 Default Assets/Libraries/Framework/Class.lua | 3 - Default Assets/Libraries/Framework/Core/Camera.lua | 5 - .../Libraries/Framework/Core/Component.lua | 11 - Default Assets/Libraries/Framework/Core/Game.lua | 14 - .../Libraries/Framework/Core/GameObject.lua | 7 - Default Assets/Libraries/Framework/Core/Sprite.lua | 21 -- .../Libraries/Framework/Math/Matrix44.lua | 7 - .../Libraries/Framework/Math/Quaternion.lua | 0 .../Libraries/Framework/Math/Vector2.lua | 0 .../Libraries/Framework/Math/Vector3.lua | 0 .../Libraries/Framework/Math/Vector4.lua | 0 .../Libraries/Framework/Utils/EventCenter.lua | 23 -- .../Libraries/Framework/Utils/StateMachine.lua | 0 Default Assets/Libraries/Framework/Utils/Util.lua | 0 Default Assets/Libraries/Framework/init.lua | 2 - Default Assets/Textures/blank.png | Bin 188 -> 0 bytes .../Libraries/Framework/Animation/Animation.lua | 0 DefaultAssets/Libraries/Framework/Class.lua | 3 + DefaultAssets/Libraries/Framework/Core/Camera.lua | 5 + .../Libraries/Framework/Core/Component.lua | 11 + DefaultAssets/Libraries/Framework/Core/Game.lua | 14 + .../Libraries/Framework/Core/GameObject.lua | 7 + DefaultAssets/Libraries/Framework/Core/Sprite.lua | 21 ++ .../Libraries/Framework/Math/Matrix44.lua | 7 + .../Libraries/Framework/Math/Quaternion.lua | 0 DefaultAssets/Libraries/Framework/Math/Vector2.lua | 0 DefaultAssets/Libraries/Framework/Math/Vector3.lua | 0 DefaultAssets/Libraries/Framework/Math/Vector4.lua | 0 .../Libraries/Framework/Utils/EventCenter.lua | 23 ++ .../Libraries/Framework/Utils/StateMachine.lua | 0 DefaultAssets/Libraries/Framework/Utils/Util.lua | 0 DefaultAssets/Libraries/Framework/init.lua | 2 + DefaultAssets/Textures/blank.png | Bin 0 -> 188 bytes Editor/EditorMain.cpp | 4 +- Editor/GUI/EditorWindows.cpp | 3 +- Editor/GUI/EditorWindows.h | 4 + Editor/Scripts/EditorMain.lua | 17 + Projects/VisualStudio/Editor/Editor.vcxproj | 46 ++- .../VisualStudio/Editor/Editor.vcxproj.filters | 84 ++++- Projects/VisualStudio/lua51/lua51.vcxproj | 29 +- Runtime/Scripting/LuaBindVM.cpp | 4 +- 43 files changed, 632 insertions(+), 113 deletions(-) create mode 100644 .gitignore delete mode 100644 Default Assets/Libraries/Framework/Animation/Animation.lua delete mode 100644 Default Assets/Libraries/Framework/Class.lua delete mode 100644 Default Assets/Libraries/Framework/Core/Camera.lua delete mode 100644 Default Assets/Libraries/Framework/Core/Component.lua delete mode 100644 Default Assets/Libraries/Framework/Core/Game.lua delete mode 100644 Default Assets/Libraries/Framework/Core/GameObject.lua delete mode 100644 Default Assets/Libraries/Framework/Core/Sprite.lua delete mode 100644 Default Assets/Libraries/Framework/Math/Matrix44.lua delete mode 100644 Default Assets/Libraries/Framework/Math/Quaternion.lua delete mode 100644 Default Assets/Libraries/Framework/Math/Vector2.lua delete mode 100644 Default Assets/Libraries/Framework/Math/Vector3.lua delete mode 100644 Default Assets/Libraries/Framework/Math/Vector4.lua delete mode 100644 Default Assets/Libraries/Framework/Utils/EventCenter.lua delete mode 100644 Default Assets/Libraries/Framework/Utils/StateMachine.lua delete mode 100644 Default Assets/Libraries/Framework/Utils/Util.lua delete mode 100644 Default Assets/Libraries/Framework/init.lua delete mode 100644 Default Assets/Textures/blank.png create mode 100644 DefaultAssets/Libraries/Framework/Animation/Animation.lua create mode 100644 DefaultAssets/Libraries/Framework/Class.lua create mode 100644 DefaultAssets/Libraries/Framework/Core/Camera.lua create mode 100644 DefaultAssets/Libraries/Framework/Core/Component.lua create mode 100644 DefaultAssets/Libraries/Framework/Core/Game.lua create mode 100644 DefaultAssets/Libraries/Framework/Core/GameObject.lua create mode 100644 DefaultAssets/Libraries/Framework/Core/Sprite.lua create mode 100644 DefaultAssets/Libraries/Framework/Math/Matrix44.lua create mode 100644 DefaultAssets/Libraries/Framework/Math/Quaternion.lua create mode 100644 DefaultAssets/Libraries/Framework/Math/Vector2.lua create mode 100644 DefaultAssets/Libraries/Framework/Math/Vector3.lua create mode 100644 DefaultAssets/Libraries/Framework/Math/Vector4.lua create mode 100644 DefaultAssets/Libraries/Framework/Utils/EventCenter.lua create mode 100644 DefaultAssets/Libraries/Framework/Utils/StateMachine.lua create mode 100644 DefaultAssets/Libraries/Framework/Utils/Util.lua create mode 100644 DefaultAssets/Libraries/Framework/init.lua create mode 100644 DefaultAssets/Textures/blank.png create mode 100644 Editor/Scripts/EditorMain.lua diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bca80dd --- /dev/null +++ b/.gitignore @@ -0,0 +1,368 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# lib file +*.lib + +# exe file +*.exe diff --git a/Default Assets/Libraries/Framework/Animation/Animation.lua b/Default Assets/Libraries/Framework/Animation/Animation.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Default Assets/Libraries/Framework/Class.lua b/Default Assets/Libraries/Framework/Class.lua deleted file mode 100644 index 78c577c..0000000 --- a/Default Assets/Libraries/Framework/Class.lua +++ /dev/null @@ -1,3 +0,0 @@ -function Class() - -end \ No newline at end of file diff --git a/Default Assets/Libraries/Framework/Core/Camera.lua b/Default Assets/Libraries/Framework/Core/Camera.lua deleted file mode 100644 index 5fcfbe7..0000000 --- a/Default Assets/Libraries/Framework/Core/Camera.lua +++ /dev/null @@ -1,5 +0,0 @@ -local Camera = {} - - - -return Camera \ No newline at end of file diff --git a/Default Assets/Libraries/Framework/Core/Component.lua b/Default Assets/Libraries/Framework/Core/Component.lua deleted file mode 100644 index 00bf2ca..0000000 --- a/Default Assets/Libraries/Framework/Core/Component.lua +++ /dev/null @@ -1,11 +0,0 @@ -local Component = {} - -Component.New = function() - -end - -Component.GetGameObject = function() - -end - -Jin.Component = Component \ No newline at end of file diff --git a/Default Assets/Libraries/Framework/Core/Game.lua b/Default Assets/Libraries/Framework/Core/Game.lua deleted file mode 100644 index 51ce25f..0000000 --- a/Default Assets/Libraries/Framework/Core/Game.lua +++ /dev/null @@ -1,14 +0,0 @@ - --- Game entry - -local Game = {} - -Game.OnEvent = function(e) - -end - -Game.MainLoop = function() - -end - -return Game \ No newline at end of file diff --git a/Default Assets/Libraries/Framework/Core/GameObject.lua b/Default Assets/Libraries/Framework/Core/GameObject.lua deleted file mode 100644 index ee0d143..0000000 --- a/Default Assets/Libraries/Framework/Core/GameObject.lua +++ /dev/null @@ -1,7 +0,0 @@ -local GameObject = {} - -GameObject.AddComponent = function(self, comp) - -end - -Jin.GameObject = GameObject diff --git a/Default Assets/Libraries/Framework/Core/Sprite.lua b/Default Assets/Libraries/Framework/Core/Sprite.lua deleted file mode 100644 index 47cb50d..0000000 --- a/Default Assets/Libraries/Framework/Core/Sprite.lua +++ /dev/null @@ -1,21 +0,0 @@ --- 对Quad的封装，更能适合2D游戏开发 -local Sprite = {} - -Sprite.New = function(quad) - local spr = {} - spr.quad = Jin.Quad.New(quad) - spr.pivot = Jin.Vector2.New(0.5, 0) - spr.transform = Jin.Transform.New() - spr.depth = 0 - return spr -end - -Sprite.SetDepth = function(self, depth) - spr.depth = depth -end - -Sprite.SetTexture = function(self, tex, reset_quad) - -end - -Jin.Sprite = Sprite \ No newline at end of file diff --git a/Default Assets/Libraries/Framework/Math/Matrix44.lua b/Default Assets/Libraries/Framework/Math/Matrix44.lua deleted file mode 100644 index b572f74..0000000 --- a/Default Assets/Libraries/Framework/Math/Matrix44.lua +++ /dev/null @@ -1,7 +0,0 @@ -local Matrix44 = {} - -Matrix44.New = function() - -end - -return Matrix44 \ No newline at end of file diff --git a/Default Assets/Libraries/Framework/Math/Quaternion.lua b/Default Assets/Libraries/Framework/Math/Quaternion.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Default Assets/Libraries/Framework/Math/Vector2.lua b/Default Assets/Libraries/Framework/Math/Vector2.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Default Assets/Libraries/Framework/Math/Vector3.lua b/Default Assets/Libraries/Framework/Math/Vector3.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Default Assets/Libraries/Framework/Math/Vector4.lua b/Default Assets/Libraries/Framework/Math/Vector4.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Default Assets/Libraries/Framework/Utils/EventCenter.lua b/Default Assets/Libraries/Framework/Utils/EventCenter.lua deleted file mode 100644 index 664ecba..0000000 --- a/Default Assets/Libraries/Framework/Utils/EventCenter.lua +++ /dev/null @@ -1,23 +0,0 @@ -local EventCenter = {} - -EventCenter.Subscribe = function(event, callback) - -end - -EventCenter.Unsubscribe = function(event, callback) - -end - -EventCenter.UnsubscribeAll = function(event) - -end - -EventCenter.Publish = function(event, ...) - -end - -EventCenter.Clear = function() - -end - -Jin.EventCenter = EventCenter \ No newline at end of file diff --git a/Default Assets/Libraries/Framework/Utils/StateMachine.lua b/Default Assets/Libraries/Framework/Utils/StateMachine.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Default Assets/Libraries/Framework/Utils/Util.lua b/Default Assets/Libraries/Framework/Utils/Util.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Default Assets/Libraries/Framework/init.lua b/Default Assets/Libraries/Framework/init.lua deleted file mode 100644 index 8b96176..0000000 --- a/Default Assets/Libraries/Framework/init.lua +++ /dev/null @@ -1,2 +0,0 @@ ---Jin游戏框架 ---可选，用户可以自行决定是否使用此框架 diff --git a/Default Assets/Textures/blank.png b/Default Assets/Textures/blank.png deleted file mode 100644 index 877e031..0000000 Binary files a/Default Assets/Textures/blank.png and /dev/null differ diff --git a/DefaultAssets/Libraries/Framework/Animation/Animation.lua b/DefaultAssets/Libraries/Framework/Animation/Animation.lua new file mode 100644 index 0000000..e69de29 diff --git a/DefaultAssets/Libraries/Framework/Class.lua b/DefaultAssets/Libraries/Framework/Class.lua new file mode 100644 index 0000000..78c577c --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Class.lua @@ -0,0 +1,3 @@ +function Class() + +end \ No newline at end of file diff --git a/DefaultAssets/Libraries/Framework/Core/Camera.lua b/DefaultAssets/Libraries/Framework/Core/Camera.lua new file mode 100644 index 0000000..5fcfbe7 --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Core/Camera.lua @@ -0,0 +1,5 @@ +local Camera = {} + + + +return Camera \ No newline at end of file diff --git a/DefaultAssets/Libraries/Framework/Core/Component.lua b/DefaultAssets/Libraries/Framework/Core/Component.lua new file mode 100644 index 0000000..00bf2ca --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Core/Component.lua @@ -0,0 +1,11 @@ +local Component = {} + +Component.New = function() + +end + +Component.GetGameObject = function() + +end + +Jin.Component = Component \ No newline at end of file diff --git a/DefaultAssets/Libraries/Framework/Core/Game.lua b/DefaultAssets/Libraries/Framework/Core/Game.lua new file mode 100644 index 0000000..51ce25f --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Core/Game.lua @@ -0,0 +1,14 @@ + +-- Game entry + +local Game = {} + +Game.OnEvent = function(e) + +end + +Game.MainLoop = function() + +end + +return Game \ No newline at end of file diff --git a/DefaultAssets/Libraries/Framework/Core/GameObject.lua b/DefaultAssets/Libraries/Framework/Core/GameObject.lua new file mode 100644 index 0000000..ee0d143 --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Core/GameObject.lua @@ -0,0 +1,7 @@ +local GameObject = {} + +GameObject.AddComponent = function(self, comp) + +end + +Jin.GameObject = GameObject diff --git a/DefaultAssets/Libraries/Framework/Core/Sprite.lua b/DefaultAssets/Libraries/Framework/Core/Sprite.lua new file mode 100644 index 0000000..47cb50d --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Core/Sprite.lua @@ -0,0 +1,21 @@ +-- 对Quad的封装，更能适合2D游戏开发 +local Sprite = {} + +Sprite.New = function(quad) + local spr = {} + spr.quad = Jin.Quad.New(quad) + spr.pivot = Jin.Vector2.New(0.5, 0) + spr.transform = Jin.Transform.New() + spr.depth = 0 + return spr +end + +Sprite.SetDepth = function(self, depth) + spr.depth = depth +end + +Sprite.SetTexture = function(self, tex, reset_quad) + +end + +Jin.Sprite = Sprite \ No newline at end of file diff --git a/DefaultAssets/Libraries/Framework/Math/Matrix44.lua b/DefaultAssets/Libraries/Framework/Math/Matrix44.lua new file mode 100644 index 0000000..b572f74 --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Math/Matrix44.lua @@ -0,0 +1,7 @@ +local Matrix44 = {} + +Matrix44.New = function() + +end + +return Matrix44 \ No newline at end of file diff --git a/DefaultAssets/Libraries/Framework/Math/Quaternion.lua b/DefaultAssets/Libraries/Framework/Math/Quaternion.lua new file mode 100644 index 0000000..e69de29 diff --git a/DefaultAssets/Libraries/Framework/Math/Vector2.lua b/DefaultAssets/Libraries/Framework/Math/Vector2.lua new file mode 100644 index 0000000..e69de29 diff --git a/DefaultAssets/Libraries/Framework/Math/Vector3.lua b/DefaultAssets/Libraries/Framework/Math/Vector3.lua new file mode 100644 index 0000000..e69de29 diff --git a/DefaultAssets/Libraries/Framework/Math/Vector4.lua b/DefaultAssets/Libraries/Framework/Math/Vector4.lua new file mode 100644 index 0000000..e69de29 diff --git a/DefaultAssets/Libraries/Framework/Utils/EventCenter.lua b/DefaultAssets/Libraries/Framework/Utils/EventCenter.lua new file mode 100644 index 0000000..664ecba --- /dev/null +++ b/DefaultAssets/Libraries/Framework/Utils/EventCenter.lua @@ -0,0 +1,23 @@ +local EventCenter = {} + +EventCenter.Subscribe = function(event, callback) + +end + +EventCenter.Unsubscribe = function(event, callback) + +end + +EventCenter.UnsubscribeAll = function(event) + +end + +EventCenter.Publish = function(event, ...) + +end + +EventCenter.Clear = function() + +end + +Jin.EventCenter = EventCenter \ No newline at end of file diff --git a/DefaultAssets/Libraries/Framework/Utils/StateMachine.lua b/DefaultAssets/Libraries/Framework/Utils/StateMachine.lua new file mode 100644 index 0000000..e69de29 diff --git a/DefaultAssets/Libraries/Framework/Utils/Util.lua b/DefaultAssets/Libraries/Framework/Utils/Util.lua new file mode 100644 index 0000000..e69de29 diff --git a/DefaultAssets/Libraries/Framework/init.lua b/DefaultAssets/Libraries/Framework/init.lua new file mode 100644 index 0000000..8b96176 --- /dev/null +++ b/DefaultAssets/Libraries/Framework/init.lua @@ -0,0 +1,2 @@ +--Jin游戏框架 +--可选，用户可以自行决定是否使用此框架 diff --git a/DefaultAssets/Textures/blank.png b/DefaultAssets/Textures/blank.png new file mode 100644 index 0000000..877e031 Binary files /dev/null and b/DefaultAssets/Textures/blank.png differ diff --git a/Editor/EditorMain.cpp b/Editor/EditorMain.cpp index d45d08b..8868d88 100644 --- a/Editor/EditorMain.cpp +++ b/Editor/EditorMain.cpp @@ -1,6 +1,7 @@ #include #include #include "GUI/EditorWindows.h" +#include "Runtime/Scripting/LuaBind.h" static int MainMessageLoop() { @@ -22,6 +23,7 @@ static int MainMessageLoop() if (msg.message == WM_QUIT) isQuitSignaled = true; + } } @@ -42,4 +44,4 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) MainMessageLoop(); return 0; -} +} \ No newline at end of file diff --git a/Editor/GUI/EditorWindows.cpp b/Editor/GUI/EditorWindows.cpp index 00c573a..6d24dbd 100644 --- a/Editor/GUI/EditorWindows.cpp +++ b/Editor/GUI/EditorWindows.cpp @@ -166,5 +166,6 @@ LRESULT CALLBACK GUIView::GUIViewWndProc(HWND hWnd, UINT message, WPARAM wParam, void GUIView::DoPaint() { - + + } \ No newline at end of file diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h index a78e163..4bd33ec 100644 --- a/Editor/GUI/EditorWindows.h +++ b/Editor/GUI/EditorWindows.h @@ -3,6 +3,7 @@ #include #include "Runtime/Math/Rect.h" +#include "Runtime/Scripting/LuaBind.h" void RegisterWindowClasses(); @@ -51,6 +52,9 @@ public: private: HWND m_View; + LuaBind::Ref m_Script; + + }; #endif \ No newline at end of file diff --git a/Editor/Scripts/EditorMain.lua b/Editor/Scripts/EditorMain.lua new file mode 100644 index 0000000..2de656d --- /dev/null +++ b/Editor/Scripts/EditorMain.lua @@ -0,0 +1,17 @@ +local Editor = GameLab.Editor +local Engine = GameLab.Engine + +local ViewEditor = {} + +function ViewEditor:OnGUI() + +end + +function main() + local view = Editor.ContainnerWindow.New(ViewEditor) + +end + + + +main() \ No newline at end of file diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj index 21ae963..c682fe5 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj +++ b/Projects/VisualStudio/Editor/Editor.vcxproj @@ -88,7 +88,7 @@ true true _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty;%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) Windows @@ -101,10 +101,10 @@ true true _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty;%(AdditionalIncludeDirectories) + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) - Console + Windows %(AdditionalDependencies) @@ -116,9 +116,10 @@ true true true + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) - Console + Windows true true @@ -131,22 +132,31 @@ true true true + $(SolutionDir)..\..\;%(AdditionalIncludeDirectories) - Console + Windows true true + - - + + + + + + + + + @@ -155,12 +165,25 @@ - + + + + + + + + + + + + + + @@ -175,6 +198,13 @@ {385f2d3a-1cef-4aa1-8051-527f6b68dd81} + + {ad09415f-4bf9-4fce-901f-7ab22d429cfc} + + + + + diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters index e537df8..982bd5b 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters @@ -10,6 +10,9 @@ {61174975-2b52-426f-b871-d33e1bf956d4} + + {f9573ff2-4a53-4953-806e-f0ce0c586910} + @@ -18,8 +21,6 @@ GUI - - GUI @@ -38,6 +39,34 @@ GUI + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + @@ -46,7 +75,6 @@ GUI - GUI @@ -95,5 +123,55 @@ GUI + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + Scripting + + + + + Scripting + + + Scripting + \ No newline at end of file diff --git a/Projects/VisualStudio/lua51/lua51.vcxproj b/Projects/VisualStudio/lua51/lua51.vcxproj index 99605c6..fb0faec 100644 --- a/Projects/VisualStudio/lua51/lua51.vcxproj +++ b/Projects/VisualStudio/lua51/lua51.vcxproj @@ -26,26 +26,26 @@ - Application + StaticLibrary true v141 MultiByte - Application + StaticLibrary false v141 true MultiByte - Application + StaticLibrary true v141 MultiByte - Application + StaticLibrary false v141 true @@ -69,13 +69,26 @@ - + + $(SolutionDir)..\..\Build + + + $(SolutionDir)..\..\Build + + + $(SolutionDir)..\..\Build + + + $(SolutionDir)..\..\Build + Level3 Disabled true true + _CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions) + CompileAsC Console @@ -87,6 +100,8 @@ Disabled true true + _CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions) + CompileAsC Console @@ -100,6 +115,8 @@ true true true + _CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions) + CompileAsC Console @@ -115,6 +132,8 @@ true true true + _CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions) + CompileAsC Console diff --git a/Runtime/Scripting/LuaBindVM.cpp b/Runtime/Scripting/LuaBindVM.cpp index b50a5e1..4677650 100644 --- a/Runtime/Scripting/LuaBindVM.cpp +++ b/Runtime/Scripting/LuaBindVM.cpp @@ -42,8 +42,8 @@ namespace LuaBind { LUA_BIND_STATE(mMainThread); - mStrongRefTable.Init(state, "_LUA_BIND_STRONGREF_TABLE"); - mWeakRefTable.Init(state, "_LUA_BIND_WEAKREF_TABLE", "v"); + mStrongRefTable.Init(state, "UNIVERSAL_STRONGREF_TABLE"); + mWeakRefTable.Init(state, "UNIVERSAL_WEAKREF_TABLE", "v"); } lua_State* VM::CreateThread() -- cgit v1.1-26-g67d0