optional formal changes

This commit is contained in:
ehriche 2015-05-06 00:56:59 +02:00
parent fe13c728fd
commit 897a1aade5
15 changed files with 30 additions and 26 deletions

View File

@ -1850,7 +1850,7 @@ void ResourceFormatSaverXMLInstance::escape(String& p_str) {
p_str=p_str.replace(">","<");
p_str=p_str.replace("'","'");
p_str=p_str.replace("\"",""");
for (int i=1;i<32;i++) {
for (char i=1;i<32;i++) {
char chr[2]={i,0};
const char hexn[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};

View File

@ -36,8 +36,9 @@ uint32_t Math::default_seed=1;
#define PHI 0x9e3779b9
static uint32_t Q[4096], c = 362436;
#if 0
static uint32_t Q[4096];
#endif
uint32_t Math::rand_from_seed(uint32_t *seed) {
@ -269,7 +270,7 @@ bool Math::is_inf(double p_val) {
uint32_t Math::larger_prime(uint32_t p_val) {
static const int primes[] = {
static const uint32_t primes[] = {
5,
13,
23,

View File

@ -317,8 +317,8 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
/* set the name and class hints for the window manager to use */
classHint = XAllocClassHint();
if (classHint) {
classHint->res_name = "Godot";
classHint->res_class = "Godot";
classHint->res_name = (char *)"Godot";
classHint->res_class = (char *)"Godot";
}
XSetClassHint(x11_display, x11_window, classHint);
XFree(classHint);

View File

@ -132,8 +132,7 @@ Matrix32 Camera2D::get_camera_transform() {
}
Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());;
screen_offset;
Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());
float angle = get_global_transform().get_rotation();
if(rotating){

View File

@ -272,7 +272,7 @@ void LineEdit::_input_event(InputEvent p_event) {
if (editable) {
selection_delete();
CharType ucodestr[2]={k.unicode,0};
CharType ucodestr[2]={(CharType)k.unicode,0};
append_at_cursor(ucodestr);
emit_signal("text_changed",text);
_change_notify("text");

View File

@ -1440,7 +1440,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
} else {
//different char, go back
const CharType chr[2] = {k.unicode, 0};
const CharType chr[2] = {(CharType)k.unicode, 0};
if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
_consume_pair_symbol(chr[0]);
} else {
@ -2062,7 +2062,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
if (readonly)
break;
const CharType chr[2] = {k.unicode, 0};
const CharType chr[2] = {(CharType)k.unicode, 0};
if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
_consume_pair_symbol(chr[0]);

View File

@ -34,8 +34,10 @@
#include "self_list.h"
#include "broad_phase_sw.h"
#define MAX_OBJECT_DISTANCE 10000000
#ifdef DEBUG_ENABLED
#define MAX_OBJECT_DISTANCE 10000000.0
#define MAX_OBJECT_DISTANCE_X2 (MAX_OBJECT_DISTANCE*MAX_OBJECT_DISTANCE)
#endif
class SpaceSW;

View File

@ -863,17 +863,17 @@ public:
if (polygon->indices != NULL) {
r.pos=polygon->points[polygon->indices[0]];
for (int i=1; i<polygon->count; i++) {
for (int i=1; i<l; i++) {
r.expand_to(polygon->points[polygon->indices[i]]);
};
}
} else {
r.pos=polygon->points[0];
for (int i=1; i<polygon->count; i++) {
for (int i=1; i<l; i++) {
r.expand_to(polygon->points[i]);
};
};
}
}
} break;
case CanvasItem::Command::TYPE_CIRCLE: {

View File

@ -7281,7 +7281,7 @@ void VisualServerRaster::_draw_viewports() {
if (r.size.width==0)
r.size.width=window_w;
if (r.size.height==0)
r.size.height=window_w;
r.size.height=window_h;
_draw_viewport(vp,r.pos.x,r.pos.y,r.size.width,r.size.height);

View File

@ -65,7 +65,7 @@ static String _escape_string(const String& p_str) {
ret=ret.replace(">","&lt;");
ret=ret.replace("'","&apos;");
ret=ret.replace("\"","&quot;");
for (int i=1;i<32;i++) {
for (char i=1;i<32;i++) {
char chr[2]={i,0};
ret=ret.replace(chr,"&#"+String::num(i)+";");

View File

@ -1375,7 +1375,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) {
if (p_input.is_action("ui_up"))
selected_track--;
if (v_scroll->is_visible() && p_input.is_action("ui_page_up"))
selected_track--;;
selected_track--;
if (selected_track<0)
selected_track=0;

View File

@ -940,13 +940,13 @@ String EditorFileSystem::get_file_type(const String& p_file) const {
EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) {
if (!filesystem || scanning)
return false;
return NULL;
String f = Globals::get_singleton()->localize_path(p_path);
if (!f.begins_with("res://"))
return false;
return NULL;
f=f.substr(6,f.length());
@ -960,7 +960,7 @@ EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) {
Vector<String> path = f.split("/");
if (path.size()==0)
return false;
return NULL;
EditorFileSystemDirectory *fs=filesystem;

View File

@ -51,6 +51,7 @@ static const char *flag_names[]={
NULL
};
#if 0 // not used
static const char *flag_short_names[]={
"Stream",
"FixBorder",
@ -65,6 +66,7 @@ static const char *flag_short_names[]={
"Anisoropic",
NULL
};
#endif
void EditorImportTextureOptions::set_format(EditorTextureImportPlugin::ImageFormat p_format) {

View File

@ -539,7 +539,6 @@ void GraphCurveMapEdit::_plot_curve(const Vector2& p_a,const Vector2& p_b,const
if ((lastx != newx) || (lasty != newy))
{
#if 0
/*
if(fix255)
{
/* use fixed array size (for the curve graph) */

View File

@ -1257,7 +1257,8 @@ void SkeletonSpatialGizmo::redraw() {
//find closest axis
int closest=-1;
float closest_d;
float closest_d = 0.0;
for(int j=0;j<3;j++) {
float dp = Math::abs(grests[parent].basis[j].normalized().dot(d));
if (j==0 || dp>closest_d)