aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/Jin.exebin504832 -> 504832 bytes
-rw-r--r--build/vc++/3rdparty/GLee/GLee.vcxproj2
-rw-r--r--build/vc++/3rdparty/smount/smount.vcxproj2
-rw-r--r--build/vc++/3rdparty/stb/stb.vcxproj2
-rw-r--r--build/vc++/3rdparty/tekcos/tekcos.vcxproj2
-rw-r--r--build/vc++/3rdparty/wav/wav.vcxproj2
-rw-r--r--build/vc++/jin.vcxproj4
-rw-r--r--build/vc++/jin/jin.vcxproj.user5
-rw-r--r--build/vc++/libjin/libjin.vcxproj2
-rw-r--r--src/libjin/Filesystem/je_asset_database.cpp5
-rw-r--r--src/libjin/Graphics/je_sprite.h4
-rw-r--r--src/lua/embed/embed.h44
12 files changed, 38 insertions, 36 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe
index 06d1e54..1ee05bf 100644
--- a/bin/Jin.exe
+++ b/bin/Jin.exe
Binary files differ
diff --git a/build/vc++/3rdparty/GLee/GLee.vcxproj b/build/vc++/3rdparty/GLee/GLee.vcxproj
index 007dc38..7efcdd2 100644
--- a/build/vc++/3rdparty/GLee/GLee.vcxproj
+++ b/build/vc++/3rdparty/GLee/GLee.vcxproj
@@ -78,7 +78,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <Optimization>MinSpace</Optimization>
+ <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>false</ConformanceMode>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/vc++/3rdparty/smount/smount.vcxproj b/build/vc++/3rdparty/smount/smount.vcxproj
index c174850..6b710f4 100644
--- a/build/vc++/3rdparty/smount/smount.vcxproj
+++ b/build/vc++/3rdparty/smount/smount.vcxproj
@@ -78,7 +78,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <Optimization>MinSpace</Optimization>
+ <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>false</ConformanceMode>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/vc++/3rdparty/stb/stb.vcxproj b/build/vc++/3rdparty/stb/stb.vcxproj
index 6cb9b3f..e6abf2a 100644
--- a/build/vc++/3rdparty/stb/stb.vcxproj
+++ b/build/vc++/3rdparty/stb/stb.vcxproj
@@ -78,7 +78,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <Optimization>MinSpace</Optimization>
+ <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>false</ConformanceMode>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/vc++/3rdparty/tekcos/tekcos.vcxproj b/build/vc++/3rdparty/tekcos/tekcos.vcxproj
index 3148e63..e8a5bd7 100644
--- a/build/vc++/3rdparty/tekcos/tekcos.vcxproj
+++ b/build/vc++/3rdparty/tekcos/tekcos.vcxproj
@@ -78,7 +78,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <Optimization>MinSpace</Optimization>
+ <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>false</ConformanceMode>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/vc++/3rdparty/wav/wav.vcxproj b/build/vc++/3rdparty/wav/wav.vcxproj
index bba56a1..ff62736 100644
--- a/build/vc++/3rdparty/wav/wav.vcxproj
+++ b/build/vc++/3rdparty/wav/wav.vcxproj
@@ -78,7 +78,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <Optimization>MinSpace</Optimization>
+ <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>false</ConformanceMode>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index b233e67..f512551 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -22,7 +22,7 @@
<ProjectGuid>{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}</ProjectGuid>
<RootNamespace>jin</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- <ProjectName>libjin-lua</ProjectName>
+ <ProjectName>luaport</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -89,7 +89,7 @@
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <Optimization>MinSpace</Optimization>
+ <Optimization>Disabled</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>opengl32.lib;lua51.lib;SDL2main.lib;SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/vc++/jin/jin.vcxproj.user b/build/vc++/jin/jin.vcxproj.user
index be25078..8790539 100644
--- a/build/vc++/jin/jin.vcxproj.user
+++ b/build/vc++/jin/jin.vcxproj.user
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\bin</LocalDebuggerWorkingDirectory>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
</Project> \ No newline at end of file
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index c993555..049f1d8 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -98,7 +98,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <Optimization>MinSpace</Optimization>
+ <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>false</ConformanceMode>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/src/libjin/Filesystem/je_asset_database.cpp b/src/libjin/Filesystem/je_asset_database.cpp
index ac547f0..f2c5681 100644
--- a/src/libjin/Filesystem/je_asset_database.cpp
+++ b/src/libjin/Filesystem/je_asset_database.cpp
@@ -73,12 +73,11 @@ namespace JinEngine
{
return smtexists(mSmt, path) == 0;
}
-
+/*
std::vector<std::string> AssetDatabase::getFiles(const char* path, bool recursive)
{
-
}
-
+*/
} // namespace Filesystem
} // namespace JinEngine
diff --git a/src/libjin/Graphics/je_sprite.h b/src/libjin/Graphics/je_sprite.h
index 94c39cd..df8d6eb 100644
--- a/src/libjin/Graphics/je_sprite.h
+++ b/src/libjin/Graphics/je_sprite.h
@@ -18,7 +18,7 @@ namespace JinEngine
class Sprite
{
public:
- void setOrigin(float x, float y);
+ void setOrigin(int x, int y);
void setPosition(int x, int y);
void setScale(float x, float y);
void setColor(Color color);
@@ -35,7 +35,7 @@ namespace JinEngine
/// Origin must be 0~1 float value.
///
Math::Vector2<float> mPosition;
- Math::Vector2<float> mOrigin;
+ Math::Vector2<int> mOrigin;
Math::Vector2<float> mScale;
Color mColor;
Shader* mShader;
diff --git a/src/lua/embed/embed.h b/src/lua/embed/embed.h
index 18373c8..e343dcd 100644
--- a/src/lua/embed/embed.h
+++ b/src/lua/embed/embed.h
@@ -4,28 +4,26 @@
namespace JinEngine
{
-namespace embed
-{
+ namespace embed
+ {
-#define embed(L, script, name)\
- if(luax_loadbuffer(L, script, strlen(script), name) == 0)\
- lua_call(L, 0, 0);
+ #define embed(L, script, name)\
+ if(luax_loadbuffer(L, script, strlen(script), name) == 0)\
+ lua_call(L, 0, 0);
- /**
- * embed structure.
- */
- struct jin_Embed
- {
- const char* file, *source;
- };
+ /**
+ * embed structure.
+ */
+ struct jin_Embed
+ {
+ const char* file, *source;
+ };
- static void boot(lua_State* L)
- {
// embed scripts
- #include "graphics.lua.h"
- #include "keyboard.lua.h"
- #include "mouse.lua.h"
- #include "boot.lua.h"
+ #include "graphics.lua.h"
+ #include "keyboard.lua.h"
+ #include "mouse.lua.h"
+ #include "boot.lua.h"
// in order
const jin_Embed scripts[] = {
@@ -36,11 +34,13 @@ namespace embed
{ 0, 0 }
};
- for (int i = 0; scripts[i].file; ++i)
- embed(L, scripts[i].source, scripts[i].file);
- }
+ static void boot(lua_State* L)
+ {
+ for (int i = 0; scripts[i].file; ++i)
+ embed(L, scripts[i].source, scripts[i].file);
+ }
-} // embed
+ } // embed
} // namespace JinEngine
#endif \ No newline at end of file
generated by cgit v1.1-26-g67d0 at 2025-05-21 20:27:28 +0000