[Registry] Small fixes.
This commit is contained in:
Quentin Bazin
parent
4f64ede62a
commit
96da02fa15
@ -1,155 +0,0 @@
|
||||
# Generated by YCM Generator at 2018-06-23 05:37:41.580065
|
||||
|
||||
# This file is NOT licensed under the GPLv3, which is the license for the rest
|
||||
# of YouCompleteMe.
|
||||
#
|
||||
# Here's the license text for this file:
|
||||
#
|
||||
# This is free and unencumbered software released into the public domain.
|
||||
#
|
||||
# Anyone is free to copy, modify, publish, use, compile, sell, or
|
||||
# distribute this software, either in source code form or as a compiled
|
||||
# binary, for any purpose, commercial or non-commercial, and by any
|
||||
# means.
|
||||
#
|
||||
# In jurisdictions that recognize copyright laws, the author or authors
|
||||
# of this software dedicate any and all copyright interest in the
|
||||
# software to the public domain. We make this dedication for the benefit
|
||||
# of the public at large and to the detriment of our heirs and
|
||||
# successors. We intend this dedication to be an overt act of
|
||||
# relinquishment in perpetuity of all present and future rights to this
|
||||
# software under copyright law.
|
||||
#
|
||||
# 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 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.
|
||||
#
|
||||
# For more information, please refer to <http://unlicense.org/>
|
||||
|
||||
import os
|
||||
import ycm_core
|
||||
|
||||
flags = [
|
||||
'-x',
|
||||
'c++',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/core',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/display',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/gl',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/gui',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/hud',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/inventory',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/resource',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/states',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/system',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/utils',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/world',
|
||||
'-I/home/bazin_q/rendu/Perso/KubKraft/include/world/gen',
|
||||
'-I/usr/include/SDL2',
|
||||
'-Wall',
|
||||
'-Wextra',
|
||||
'-Wfatal-errors',
|
||||
'-Wno-variadic-macros',
|
||||
'-std=gnu++1z',
|
||||
]
|
||||
|
||||
|
||||
# Set this to the absolute path to the folder (NOT the file!) containing the
|
||||
# compile_commands.json file to use that instead of 'flags'. See here for
|
||||
# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
|
||||
#
|
||||
# You can get CMake to generate this file for you by adding:
|
||||
# set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
|
||||
# to your CMakeLists.txt file.
|
||||
#
|
||||
# Most projects will NOT need to set this to anything; you can just change the
|
||||
# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
|
||||
compilation_database_folder = ''
|
||||
|
||||
if os.path.exists( compilation_database_folder ):
|
||||
database = ycm_core.CompilationDatabase( compilation_database_folder )
|
||||
else:
|
||||
database = None
|
||||
|
||||
SOURCE_EXTENSIONS = [ '.C', '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
|
||||
|
||||
def DirectoryOfThisScript():
|
||||
return os.path.dirname( os.path.abspath( __file__ ) )
|
||||
|
||||
|
||||
def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
|
||||
if not working_directory:
|
||||
return list( flags )
|
||||
new_flags = []
|
||||
make_next_absolute = False
|
||||
path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
|
||||
for flag in flags:
|
||||
new_flag = flag
|
||||
|
||||
if make_next_absolute:
|
||||
make_next_absolute = False
|
||||
if not flag.startswith( '/' ):
|
||||
new_flag = os.path.join( working_directory, flag )
|
||||
|
||||
for path_flag in path_flags:
|
||||
if flag == path_flag:
|
||||
make_next_absolute = True
|
||||
break
|
||||
|
||||
if flag.startswith( path_flag ):
|
||||
path = flag[ len( path_flag ): ]
|
||||
new_flag = path_flag + os.path.join( working_directory, path )
|
||||
break
|
||||
|
||||
if new_flag:
|
||||
new_flags.append( new_flag )
|
||||
return new_flags
|
||||
|
||||
|
||||
def IsHeaderFile( filename ):
|
||||
extension = os.path.splitext( filename )[ 1 ]
|
||||
return extension in [ '.H', '.h', '.hxx', '.hpp', '.hh' ]
|
||||
|
||||
|
||||
def GetCompilationInfoForFile( filename ):
|
||||
# The compilation_commands.json file generated by CMake does not have entries
|
||||
# for header files. So we do our best by asking the db for flags for a
|
||||
# corresponding source file, if any. If one exists, the flags for that file
|
||||
# should be good enough.
|
||||
if IsHeaderFile( filename ):
|
||||
basename = os.path.splitext( filename )[ 0 ]
|
||||
for extension in SOURCE_EXTENSIONS:
|
||||
replacement_file = basename + extension
|
||||
if os.path.exists( replacement_file ):
|
||||
compilation_info = database.GetCompilationInfoForFile(
|
||||
replacement_file )
|
||||
if compilation_info.compiler_flags_:
|
||||
return compilation_info
|
||||
return None
|
||||
return database.GetCompilationInfoForFile( filename )
|
||||
|
||||
|
||||
def FlagsForFile( filename, **kwargs ):
|
||||
if database:
|
||||
# Bear in mind that compilation_info.compiler_flags_ does NOT return a
|
||||
# python list, but a "list-like" StringVec object
|
||||
compilation_info = GetCompilationInfoForFile( filename )
|
||||
if not compilation_info:
|
||||
return None
|
||||
|
||||
final_flags = MakeRelativePathsInFlagsAbsolute(
|
||||
compilation_info.compiler_flags_,
|
||||
compilation_info.compiler_working_dir_ )
|
||||
|
||||
else:
|
||||
relative_to = DirectoryOfThisScript()
|
||||
final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
|
||||
|
||||
return {
|
||||
'flags': final_flags,
|
||||
'do_cache': True
|
||||
}
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
<block id="2" name="Cobblestone" textureID="38" hardness="2" harvestRequirements="1" />
|
||||
|
||||
<block id="3" name="Grass" textureID="226">
|
||||
<drop_item id="1" amount="1" />
|
||||
<item_drop id="1" amount="1" />
|
||||
</block>
|
||||
|
||||
<block id="4" name="Leaves" textureID="266" hardness="0.5" />
|
||||
<block id="5" name="Wood" textureID="277" hardness="2" />
|
||||
|
||||
<block id="6" name="Stone" textureID="402" hardness="1.5" harvestRequirements="1">
|
||||
<drop_item id="2" amount="1" />
|
||||
<item_drop id="2" amount="1" />
|
||||
</block>
|
||||
|
||||
<block id="7" name="Sand" textureID="369" />
|
||||
@ -19,7 +19,7 @@
|
||||
<block id="9" name="Glass" textureID="168" />
|
||||
|
||||
<block id="10" name="Coal Ore" textureID="36" hardness="3" harvestRequirements="1">
|
||||
<drop_item id="" amount="1" />
|
||||
<item_drop id="38" amount="1" />
|
||||
</block>
|
||||
|
||||
<block id="11" name="Planks" textureID="316" />
|
||||
|
||||
@ -46,6 +46,11 @@ void Registry::registerBlocks() {
|
||||
unsigned int harvestRequirements = 0;
|
||||
if (blockElement->QueryUnsignedAttribute("harvestRequirements", &harvestRequirements) == tinyxml2::XMLError::XML_SUCCESS)
|
||||
block.setHarvestRequirements(harvestRequirements);
|
||||
|
||||
tinyxml2::XMLElement *itemDropElement = blockElement->FirstChildElement("item_drop");
|
||||
if (itemDropElement) {
|
||||
block.setItemDrop(itemDropElement->UnsignedAttribute("id"), itemDropElement->UnsignedAttribute("amount"));
|
||||
}
|
||||
}
|
||||
|
||||
blockElement = blockElement->NextSiblingElement("block");
|
||||
|
||||
@ -101,7 +101,7 @@ void Text::updateCharWidth() {
|
||||
}
|
||||
|
||||
++l1;
|
||||
m_charWidth[i] = (int)(0.5 + (double)((float)l1 * (8.0f / (float)charMaxWidth))) + 1;
|
||||
m_charWidth[i] = 0.5f + l1 * (8.0f / charMaxWidth) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user