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
823c3def
Commit
823c3def
authored
Sep 24, 2019
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix copyright headers and style issues
parent
4f294b95
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
93 additions
and
7 deletions
+93
-7
disjoint_set.cpp
core/math/disjoint_set.cpp
+1
-1
scene.glsl
drivers/gles2/shaders/scene.glsl
+0
-3
scene.glsl
drivers/gles3/shaders/scene.glsl
+0
-1
fix_style.sh
misc/scripts/fix_style.sh
+2
-2
GodotApp.java
platform/android/java/app/src/com/godot/game/GodotApp.java
+30
-0
skin.cpp
scene/resources/skin.cpp
+30
-0
skin.h
scene/resources/skin.h
+30
-0
No files found.
core/math/disjoint_set.cpp
View file @
823c3def
/*************************************************************************/
/* disjoint_set.
h
*/
/* disjoint_set.
cpp
*/
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
...
...
drivers/gles2/shaders/scene.glsl
View file @
823c3def
...
...
@@ -61,7 +61,6 @@ uniform ivec2 skeleton_texture_size;
#endif
#endif
#ifdef USE_INSTANCING
...
...
@@ -407,10 +406,8 @@ void main() {
#endif
world_matrix
=
world_matrix
*
bone_transform
;
#endif
#ifdef USE_INSTANCING
...
...
drivers/gles3/shaders/scene.glsl
View file @
823c3def
...
...
@@ -431,7 +431,6 @@ void main() {
bone_weights
.
w
;
world_matrix
=
world_matrix
*
transpose
(
m
);
}
#endif
...
...
misc/scripts/fix_style.sh
View file @
823c3def
...
...
@@ -41,7 +41,7 @@ if $run_clang_format; then
echo
-e
"Formatting
${
extension
}
files..."
find
\(
-path
"./.git"
\
-o
-path
"./thirdparty"
\
-o
-path
"./platform/android/java/
src/com
"
\
-o
-path
"./platform/android/java/
lib/src/com/google
"
\
\)
-prune
\
-o
-name
"*
${
extension
}
"
\
-exec
clang-format
-i
{}
\;
...
...
@@ -54,7 +54,7 @@ if $run_fix_headers; then
find
\(
-path
"./.git"
-o
-path
"./thirdparty"
\)
-prune
\
-o
-regex
'.*\.\(c\|h\|cpp\|hpp\|cc\|hh\|cxx\|m\|mm\|java\)'
\
>
tmp-files
cat
tmp-files |
grep
-v
".git
\|
thirdparty
\|
theme_data.h
\|
platform/android/java/
src/com
\|
platform/android/java
/src/org/godotengine/godot/input/InputManager"
>
files
cat
tmp-files |
grep
-v
".git
\|
thirdparty
\|
theme_data.h
\|
platform/android/java/
lib/src/com/google
\|
platform/android/java/lib
/src/org/godotengine/godot/input/InputManager"
>
files
python misc/scripts/fix_headers.py
rm
-f
tmp-files files
fi
platform/android/java/app/src/com/godot/game/GodotApp.java
View file @
823c3def
/*************************************************************************/
/* GodotApp.java */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
package
com
.
godot
.
game
;
import
org.godotengine.godot.Godot
;
...
...
scene/resources/skin.cpp
View file @
823c3def
/*************************************************************************/
/* skin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "skin.h"
void
Skin
::
set_bind_count
(
int
p_size
)
{
...
...
scene/resources/skin.h
View file @
823c3def
/*************************************************************************/
/* skin.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SKIN_H
#define SKIN_H
...
...
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