Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
b675710b
Commit
b675710b
authored
Oct 03, 2016
by
Rémi Verschelde
Committed by
GitHub
Oct 03, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6677 from J08nY/issue-pck-packer
PCKPacker: Move to core from tools, fixes #4129
parents
a1a81906
b1fba2e0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
8 deletions
+4
-8
pck_packer.cpp
core/io/pck_packer.cpp
+0
-0
pck_packer.h
core/io/pck_packer.h
+0
-0
register_core_types.cpp
core/register_core_types.cpp
+3
-0
main.cpp
main/main.cpp
+1
-3
SCsub
tools/SCsub
+0
-1
SCsub
tools/pck/SCsub
+0
-4
No files found.
tools/pck
/pck_packer.cpp
→
core/io
/pck_packer.cpp
View file @
b675710b
File moved
tools/pck
/pck_packer.h
→
core/io
/pck_packer.h
View file @
b675710b
File moved
core/register_core_types.cpp
View file @
b675710b
...
...
@@ -49,6 +49,7 @@
#include "os/input.h"
#include "core/io/xml_parser.h"
#include "io/http_client.h"
#include "io/pck_packer.h"
#include "packed_data_container.h"
#include "func_ref.h"
#include "input_map.h"
...
...
@@ -146,6 +147,8 @@ void register_core_types() {
ObjectTypeDB
::
register_type
<
ConfigFile
>
();
ObjectTypeDB
::
register_type
<
PCKPacker
>
();
ObjectTypeDB
::
register_type
<
PackedDataContainer
>
();
ObjectTypeDB
::
register_virtual_type
<
PackedDataContainerRef
>
();
ObjectTypeDB
::
register_type
<
AStar
>
();
...
...
main/main.cpp
View file @
b675710b
...
...
@@ -57,7 +57,6 @@
#include "tools/editor/editor_node.h"
#include "tools/editor/project_manager.h"
#include "tools/pck/pck_packer.h"
#endif
#include "io/file_access_network.h"
...
...
@@ -1006,7 +1005,7 @@ Error Main::setup2() {
#ifdef TOOLS_ENABLED
ObjectTypeDB
::
set_current_api
(
ObjectTypeDB
::
API_EDITOR
);
EditorNode
::
register_editor_types
();
ObjectTypeDB
::
register_type
<
PCKPacker
>
();
// todo: move somewhere else
ObjectTypeDB
::
set_current_api
(
ObjectTypeDB
::
API_CORE
);
#endif
...
...
@@ -1765,4 +1764,3 @@ void Main::cleanup() {
}
tools/SCsub
View file @
b675710b
...
...
@@ -117,7 +117,6 @@ if (env["tools"]!="no"):
SConscript('editor/SCsub');
SConscript('collada/SCsub');
SConscript('doc/SCsub')
SConscript('pck/SCsub')
lib = env.Library("tool",env.tool_sources)
...
...
tools/pck/SCsub
deleted
100644 → 0
View file @
a1a81906
Import('env')
if env["tools"] == "yes":
env.add_source_files(env.tool_sources, "*.cpp")
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment